From e8a7bc997e3c67202ac44a604c5118b4e0c5066a Mon Sep 17 00:00:00 2001 From: Kumaran Rajendhiran Date: Fri, 3 Nov 2023 17:36:19 +0530 Subject: [PATCH 1/4] Fix frontend deploy --- .github/workflows/pipeline.yml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index 13269ac..e2b9788 100644 --- a/.github/workflows/pipeline.yml +++ b/.github/workflows/pipeline.yml @@ -90,7 +90,7 @@ jobs: needs: [docker_build_push] permissions: contents: write - if: github.ref_name == 'main' + if: github.ref_name == 'main' || github.ref_name == 'fix-frontend-deploy' container: image: python:3.7-stretch steps: @@ -100,16 +100,8 @@ jobs: node-version: 18 - name: Install wasp - run: curl -sSL https://get.wasp-lang.dev/installer.sh | sh - - - name: Log in to the Container registry - uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9 - with: - registry: ${{ env.REGISTRY }} - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} + run: curl -sSLk https://get.wasp-lang.dev/installer.sh | sh - - run: docker pull ghcr.io/$GITHUB_REPOSITORY:$GITHUB_REF_NAME || docker pull ghcr.io/$GITHUB_REPOSITORY || true - name: Build wasp run: wasp build - name: Build frontend From 9a78427ad1d9c299a3a8321247b629220cd4206c Mon Sep 17 00:00:00 2001 From: Kumaran Rajendhiran Date: Fri, 3 Nov 2023 17:41:06 +0530 Subject: [PATCH 2/4] Remove unnecessary stuff --- .github/workflows/pipeline.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index e2b9788..2362d35 100644 --- a/.github/workflows/pipeline.yml +++ b/.github/workflows/pipeline.yml @@ -84,9 +84,6 @@ jobs: deploy_frontend: runs-on: ubuntu-22.04 - defaults: - run: - shell: bash needs: [docker_build_push] permissions: contents: write @@ -100,7 +97,7 @@ jobs: node-version: 18 - name: Install wasp - run: curl -sSLk https://get.wasp-lang.dev/installer.sh | sh + run: curl -sSL https://get.wasp-lang.dev/installer.sh | sh - name: Build wasp run: wasp build From cff44a62770fed82053e0f038d6f41f755f3adf9 Mon Sep 17 00:00:00 2001 From: Kumaran Rajendhiran Date: Fri, 3 Nov 2023 17:46:06 +0530 Subject: [PATCH 3/4] Remove container --- .github/workflows/pipeline.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index 2362d35..5c60cfc 100644 --- a/.github/workflows/pipeline.yml +++ b/.github/workflows/pipeline.yml @@ -88,10 +88,9 @@ jobs: permissions: contents: write if: github.ref_name == 'main' || github.ref_name == 'fix-frontend-deploy' - container: - image: python:3.7-stretch steps: - - uses: actions/checkout@v3 + - name: Checkout repository + uses: actions/checkout@v4 - uses: actions/setup-node@v3 with: node-version: 18 From a0a7d0174efd8b7355133d9448a08a6c3616abaf Mon Sep 17 00:00:00 2001 From: Kumaran Rajendhiran Date: Fri, 3 Nov 2023 18:01:57 +0530 Subject: [PATCH 4/4] Remove debug --- .github/workflows/pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index 5c60cfc..3335e2e 100644 --- a/.github/workflows/pipeline.yml +++ b/.github/workflows/pipeline.yml @@ -87,7 +87,7 @@ jobs: needs: [docker_build_push] permissions: contents: write - if: github.ref_name == 'main' || github.ref_name == 'fix-frontend-deploy' + if: github.ref_name == 'main' steps: - name: Checkout repository uses: actions/checkout@v4