Skip to content
12 changes: 6 additions & 6 deletions .github/workflows/haiku-push-main-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ jobs:

environment:
name: 'DEV'
url: 'https://gapdemodev.azurewebsites.net'
url: 'https://github-actions-demo-dev-2024.azurewebsites.net'

steps:

Expand All @@ -111,7 +111,7 @@ jobs:
- name: 'Deploy to DEV Azure webapp using OIDC'
uses: azure/webapps-deploy@v2.2.10
with:
app-name: gapdemodev # Replace with your app name
app-name: github-actions-demo-dev-2024 # Replace with your app name

package: deployment-package

Expand All @@ -126,7 +126,7 @@ jobs:

environment:
name: 'STAGING'
url: 'https://gapdemostaging.azurewebsites.net'
url: 'https://github-actions-demo-staging-2024.azurewebsites.net'

steps:

Expand All @@ -148,7 +148,7 @@ jobs:
- name: 'Deploy to STAGING Azure webapp using OIDC'
uses: azure/webapps-deploy@v2.2.10
with:
app-name: gapdemostaging # Replace with your app name
app-name: github-actions-demo-staging-2024 # Replace with your app name
package: deployment-package

deploy-to-prod:
Expand All @@ -163,7 +163,7 @@ jobs:

environment:
name: 'PROD'
url: 'https://gapdemoprod.azurewebsites.net'
url: 'https://github-actions-demo-prod-2024.azurewebsites.net'

steps:

Expand All @@ -185,6 +185,6 @@ jobs:
- name: 'Deploy to PROD Azure webapp using OIDC'
uses: azure/webapps-deploy@v2.2.10
with:
app-name: gapdemoprod # Replace with your app name
app-name: github-actions-demo-prod-2024 # Replace with your app name
package: deployment-package

2 changes: 1 addition & 1 deletion haiku-src/haiku-tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ describe('GET /nonexistent', () => {
request(app)
.get('/nonexistent')
.expect('Content-Type', /html/)
.expect(400)
.expect(404)
.end((err, res) => {
if (err) return done(err);
expect(res.status).to.equal(404);
Expand Down
2 changes: 1 addition & 1 deletion haiku-src/haikus.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[
{
"text": "rain in tupelo,\ndon't forget an umbrella,\nor it will be gloom",
"text": "rain in SCS ,\ndon't forget an umbrella,\nor it will be gloom",
"image": "puddle_jumper_octodex.jpg"
},
{
Expand Down
3 changes: 2 additions & 1 deletion haiku-src/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
let express = require('express');
let app = express();
let ejs = require('ejs');
/*
/* *
const haikus = require('./haikus.json');
const port = process.env.PORT || 3000;

Expand All @@ -17,6 +17,7 @@ app.listen(port);
const haikus = require('./haikus.json');
//const express = require('express');
//const app = express();
//added a comment

app.use(express.static('public'))
app.set('view engine', 'ejs');
Expand Down