From fcb440e6900731253dd342674ee9383fea06bd41 Mon Sep 17 00:00:00 2001 From: Na'aman Hirschfeld Date: Mon, 4 Dec 2023 05:25:29 +0100 Subject: [PATCH] chore: fix github workflow issues --- .github/workflows/build.yaml | 14 +++++++------- .github/workflows/deploy_firebase.yaml | 2 +- .github/workflows/tests-go.yaml | 3 +++ .github/workflows/tests-ts.yaml | 3 +++ .github/workflows/validate.yaml | 3 +++ 5 files changed, 17 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 47103e67..cbadc35e 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -18,8 +18,8 @@ on: jobs: build: runs-on: ubuntu-latest - timeout-minutes: ${{ env.timeout }} - environment: ${{ env.environment }} + timeout-minutes: ${{ inputs.timeout }} + environment: ${{ inputs.environment }} steps: - name: Checkout id: checkout @@ -46,10 +46,10 @@ jobs: with: push: true context: . - file: ${{env.file_path}} + file: ${{inputs.file_path}} build-args: | - BUILD_TARGET=${{env.service}} - SERVICE_NAME=${{env.service}} + BUILD_TARGET=${{inputs.service}} + SERVICE_NAME=${{inputs.service}} tags: | - ${{env.gcp_region}}-docker.pkg.dev/${{env.gcp_project_id}}/basemind/${{env.service}}:latest - ${{env.gcp_region}}-docker.pkg.dev/${{env.gcp_project_id}}/basemind/${{env.service}}:${{github.sha}} + ${{env.gcp_region}}-docker.pkg.dev/${{env.gcp_project_id}}/basemind/${{inputs.service}}:latest + ${{env.gcp_region}}-docker.pkg.dev/${{env.gcp_project_id}}/basemind/${{inputs.service}}:${{github.sha}} diff --git a/.github/workflows/deploy_firebase.yaml b/.github/workflows/deploy_firebase.yaml index e7333a3b..01c00249 100644 --- a/.github/workflows/deploy_firebase.yaml +++ b/.github/workflows/deploy_firebase.yaml @@ -72,4 +72,4 @@ jobs: with: repoToken: ${{ secrets.GITHUB_TOKEN }} firebaseServiceAccount: ${{ secrets.FIREBASE_SERVICE_ACCOUNT }} - projectId: ${{ env.GCP_PROJECT_I }} + projectId: ${{ env.GCP_PROJECT_ID }} diff --git a/.github/workflows/tests-go.yaml b/.github/workflows/tests-go.yaml index ef215905..defc9a8d 100644 --- a/.github/workflows/tests-go.yaml +++ b/.github/workflows/tests-go.yaml @@ -12,6 +12,9 @@ on: pull_request: branches: - main + branches-ignore: + - development + - production paths: - 'gen/go/**' - 'go.*' diff --git a/.github/workflows/tests-ts.yaml b/.github/workflows/tests-ts.yaml index 0e09ccc3..de5ed330 100644 --- a/.github/workflows/tests-ts.yaml +++ b/.github/workflows/tests-ts.yaml @@ -12,6 +12,9 @@ on: pull_request: branches: - main + branches-ignore: + - development + - production paths: - 'frontend/**' - 'gen/ts/**' diff --git a/.github/workflows/validate.yaml b/.github/workflows/validate.yaml index cd600d1d..32d51d53 100644 --- a/.github/workflows/validate.yaml +++ b/.github/workflows/validate.yaml @@ -6,6 +6,9 @@ on: pull_request: branches: - main + branches-ignore: + - development + - production jobs: validate: runs-on: ubuntu-latest