From b502b388dfad3459ae39f929b48c7161ac1b1bf5 Mon Sep 17 00:00:00 2001 From: Max Flintoff <146855155+maxflintoff-tomtom@users.noreply.github.com> Date: Wed, 19 Jun 2024 11:23:42 +0200 Subject: [PATCH] fix: correct build issues --- .github/workflows/create-release.yml | 10 +++++----- index.js | 2 +- lib/plugins/validator.js | 1 + 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 55421620..d33421c2 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -3,7 +3,7 @@ on: workflow_dispatch: # push: # branches: -# - main-enterprise +# - main-tomtom env: REGISTRY: ghcr.io @@ -26,7 +26,7 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - name: Log in to the Container registry - uses: docker/login-action@v3 + uses: docker/login-action@v3 with: registry: ${{ env.REGISTRY }} username: ${{ github.actor }} @@ -38,14 +38,14 @@ jobs: file: ./Dockerfile load: true tags: | - ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:main-enterprise + ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:main-tomtom - name: Inspect the Docker Image run: | - docker image inspect ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:main-enterprise + docker image inspect ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:main-tomtom - name: Run Functional Tests id: functionaltest run: | - docker run --env APP_ID=${{ secrets.APP_ID }} --env PRIVATE_KEY=${{ secrets.PRIVATE_KEY }} --env WEBHOOK_SECRET=${{ secrets.WEBHOOK_SECRET }} -d -p 3000:3000 ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:main-enterprise + docker run --env APP_ID=${{ secrets.APP_ID }} --env PRIVATE_KEY=${{ secrets.PRIVATE_KEY }} --env WEBHOOK_SECRET=${{ secrets.WEBHOOK_SECRET }} -d -p 3000:3000 ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:main-tomtom sleep 10 curl http://localhost:3000 - name: Tag a final release diff --git a/index.js b/index.js index 32424eaf..9dff8136 100644 --- a/index.js +++ b/index.js @@ -227,7 +227,7 @@ module.exports = (robot, { getRouter }, Settings = require('./lib/settings')) => } async function info() { - const log = robot.log.child({ context: 'index', repository: repo.repo }) + const log = robot.log.child({ context: 'index' }) const github = await robot.auth() const installations = await github.paginate( github.apps.listInstallations.endpoint.merge({ per_page: 100 }) diff --git a/lib/plugins/validator.js b/lib/plugins/validator.js index 4d105311..9495037a 100644 --- a/lib/plugins/validator.js +++ b/lib/plugins/validator.js @@ -1,4 +1,5 @@ const NopCommand = require('../nopcommand') +const ErrorStash = require('./errorStash') module.exports = class Validator extends ErrorStash { constructor (nop, github, repo, settings, log) { super([], log, repo.repo)