diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml index da40929..f3e748a 100644 --- a/.github/workflows/CI.yaml +++ b/.github/workflows/CI.yaml @@ -5,9 +5,9 @@ name: CI on: # Triggers the workflow on push or pull request events but only for the master branch push: - branches: [ master ] + branches: [ master, dev ] pull_request: - branches: [ master ] + branches: [ master, dev ] # Allows you to run this workflow manually from the Actions tab workflow_dispatch: @@ -26,11 +26,11 @@ jobs: - name: Setup Node.js environment uses: actions/setup-node@v2.1.4 with: - node-version: 16 + node-version: 18 - name: install run: | - npm i - npm i -g typescript + npm ci - name: build - run: tsc + run: | + npm run build diff --git a/.github/workflows/master_bpi--hockeybot.yml b/.github/workflows/deploy.yml similarity index 82% rename from .github/workflows/master_bpi--hockeybot.yml rename to .github/workflows/deploy.yml index ab4e225..d163200 100644 --- a/.github/workflows/master_bpi--hockeybot.yml +++ b/.github/workflows/deploy.yml @@ -1,56 +1,62 @@ -# Docs for the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy -# More GitHub Actions for Azure: https://github.com/Azure/actions - -name: Build and deploy Node.js app to Azure Web App - bpi--hockeybot - -on: - push: - branches: - - master - workflow_dispatch: - -jobs: - build: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - - name: Set up Node.js version - uses: actions/setup-node@v1 - with: - node-version: '16.x' - - - name: npm install, build, and test - run: | - npm install - npm run build --if-present - npm run test --if-present - - - name: Upload artifact for deployment job - uses: actions/upload-artifact@v2 - with: - name: node-app - path: . - - deploy: - runs-on: ubuntu-latest - needs: build - environment: - name: 'Production' - url: ${{ steps.deploy-to-webapp.outputs.webapp-url }} - - steps: - - name: Download artifact from build job - uses: actions/download-artifact@v2 - with: - name: node-app - - - name: 'Deploy to Azure Web App' - id: deploy-to-webapp - uses: azure/webapps-deploy@v2 - with: - app-name: 'bpi--hockeybot' - slot-name: 'Production' - publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_643ACEB09D1D4CB49FBB3F0376AAE014 }} - package: . +# Docs for the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy +# More GitHub Actions for Azure: https://github.com/Azure/actions + +name: Build and deploy Node.js app to Azure Web App - bpi--hockeybot + +on: + push: + branches: + - master + workflow_dispatch: + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: Set up Node.js version + uses: actions/setup-node@v1 + with: + node-version: '18.x' + + - name: can it build? + run: | + npm install + npm run build --if-present + npm run test --if-present + + - name: pack it up + run: npm run pack --if-present + + - name: zip it + run: zip -r deploy.zip dist + + - name: upload it + uses: actions/upload-artifact@v2 + with: + name: node-app + path: deploy.zip + + deploy: + runs-on: ubuntu-latest + needs: build + environment: + name: 'Production' + url: ${{ steps.deploy-to-webapp.outputs.webapp-url }} + + steps: + - name: Download artifact from build job + uses: actions/download-artifact@v2 + with: + name: node-app + + - name: 'Deploy to Azure Web App' + id: deploy-to-webapp + uses: azure/webapps-deploy@v2 + with: + app-name: 'bpi--hockeybot' + slot-name: 'Production' + publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_643ACEB09D1D4CB49FBB3F0376AAE014 }} + package: deploy.zip diff --git a/src/commands/Scores.ts b/src/commands/Scores.ts index 99810d1..d201a3d 100644 --- a/src/commands/Scores.ts +++ b/src/commands/Scores.ts @@ -47,8 +47,8 @@ export const GetScores: Command = { const fields = await Promise.all( liveGames.map(async (game) => { const { id, gameState, awayTeam, homeTeam, gameOutcome } = game; - const away = `${awayTeam.abbrev}${awayTeam.score ? ` - ${awayTeam.score}` : ``}`; - const home = `${homeTeam.abbrev}${homeTeam.score ? ` - ${homeTeam.score}` : ``}`; + const away = `${awayTeam.abbrev}${awayTeam.score == undefined ? `` : ` - ${awayTeam.score ?? 0}`}`; + const home = `${homeTeam.abbrev}${homeTeam.score == undefined ? `` : ` - ${homeTeam.score ?? 0}`}`; let gameScoreLine = `${away} @ ${home}`; let detailsLineItems = [];