diff --git a/.github/workflows/build-rts.yml b/.github/workflows/build-rts.yml index f8356d9e02..88e13583c9 100644 --- a/.github/workflows/build-rts.yml +++ b/.github/workflows/build-rts.yml @@ -6,7 +6,7 @@ on: workflow_dispatch: push: - branches: [release, release-frozen, master] + branches: [release, master] # Only trigger if files have changed in this specific path paths: - "app/rts/**" @@ -68,14 +68,6 @@ jobs: echo ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin docker push ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-rts:${{steps.vars.outputs.tag}} - # Build release-frozen Docker image and push to Docker Hub - - name: Push release-frozen image to Docker Hub - if: success() && github.ref == 'refs/heads/release-frozen' - run: | - docker build -t ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-rts:${{steps.vars.outputs.tag}} . - echo ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin - docker push ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-rts:${{steps.vars.outputs.tag}} - # Build master Docker image and push to Docker Hub - name: Push master image to Docker Hub with commit tag if: success() && github.ref == 'refs/heads/master' diff --git a/.github/workflows/integration-tests-command.yml b/.github/workflows/integration-tests-command.yml index a861bb90af..688ec92040 100644 --- a/.github/workflows/integration-tests-command.yml +++ b/.github/workflows/integration-tests-command.yml @@ -7,7 +7,7 @@ on: jobs: server-build: - runs-on: ubuntu-latest + runs-on: buildjet-4vcpu-ubuntu-2004 if: | github.event_name == 'repository_dispatch' && github.event.client_payload.slash_command.sha != '' && @@ -1291,7 +1291,7 @@ jobs: run: working-directory: app/client # Run this job only if all the previous steps are a success and the reference if the release or master branch - if: success() && (github.ref == 'refs/heads/release' || github.ref == 'refs/heads/release-frozen' || github.ref == 'refs/heads/master') + if: success() && (github.ref == 'refs/heads/release' || github.ref == 'refs/heads/master') steps: # Update check run called "package" diff --git a/.github/workflows/server.yml b/.github/workflows/server.yml index c818a1d5bf..c7a0f92b8d 100644 --- a/.github/workflows/server.yml +++ b/.github/workflows/server.yml @@ -6,7 +6,7 @@ on: workflow_dispatch: push: - branches: [release, release-frozen, master] + branches: [release, master] # Only trigger if files have changed in this specific path paths: - "app/server/**" @@ -23,7 +23,7 @@ defaults: jobs: build: - runs-on: ubuntu-latest + runs-on: buildjet-4vcpu-ubuntu-2004 # Only run this workflow for internally triggered events if: | github.event.pull_request.head.repo.full_name == github.repository || @@ -95,26 +95,6 @@ jobs: -DprocessAllModules=true ./build.sh - # These are dummy jobs in the CI build to satisfy required status checks for merging PRs. This is a hack because Github doesn't support conditional - # required checks in monorepos. These jobs are a clone of similarly named jobs in client.yml. - # - # Check support request at: https://github.community/t/feature-request-conditional-required-checks/16761 - ui-test: - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - job: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15] - - steps: - # Checkout the code - - uses: actions/checkout@v2 - - - name: Do nothing as this is a dummy step - shell: bash - run: | - exit 0 - package: runs-on: ubuntu-latest diff --git a/.github/workflows/test-build-docker-image.yml b/.github/workflows/test-build-docker-image.yml index 22a12964c2..bc3c77c846 100644 --- a/.github/workflows/test-build-docker-image.yml +++ b/.github/workflows/test-build-docker-image.yml @@ -6,7 +6,7 @@ on: # trigger for pushes to release and master push: - branches: [release, release-frozen, master] + branches: [release, master] paths: - "app/client/**" - "app/server/**" @@ -175,7 +175,7 @@ jobs: defaults: run: working-directory: app/server - runs-on: ubuntu-latest + runs-on: buildjet-4vcpu-ubuntu-2004 # Only run this workflow for internally triggered events if: | github.event_name == 'workflow_dispatch' || @@ -417,7 +417,7 @@ jobs: (github.event_name == 'pull_request_review' && github.event.review.state == 'approved' && github.event.pull_request.head.repo.full_name == github.repository)) - runs-on: ubuntu-latest + runs-on: buildjet-4vcpu-ubuntu-2004 defaults: run: shell: bash