diff --git a/.github/workflows/TestReuseActions.yml b/.github/workflows/TestReuseActions.yml index c010f9a5c62..2bda6a350bb 100644 --- a/.github/workflows/TestReuseActions.yml +++ b/.github/workflows/TestReuseActions.yml @@ -425,7 +425,33 @@ jobs: strategy: fail-fast: false matrix: - job: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23] + job: + [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + ] # Service containers to run with this job. Required for running tests services: @@ -935,8 +961,9 @@ jobs: - name: Login to DockerHub uses: docker/login-action@v1 with: - username: ${{ secrets.DOCKER_HUB_USERNAME }} - password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} + registry: ghcr.io + username: ${{ secrets.PACKAGES_WRITE_USERNAME }} + password: ${{ secrets.PACKAGES_WRITE_PASSWORD }} # Build release Docker image and push to Docker Hub # Commenting push diff --git a/.github/workflows/build-rts.yml b/.github/workflows/build-rts.yml index f8356d9e024..f2df8548506 100644 --- a/.github/workflows/build-rts.yml +++ b/.github/workflows/build-rts.yml @@ -65,7 +65,7 @@ jobs: if: success() && github.ref == 'refs/heads/release' 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 + echo ${{ secrets.PACKAGES_WRITE_PASSWORD }} | docker login -u ${{ secrets.PACKAGES_WRITE_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 @@ -73,7 +73,7 @@ jobs: 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 + echo ${{ secrets.PACKAGES_WRITE_PASSWORD }} | docker login -u ${{ secrets.PACKAGES_WRITE_USERNAME }} --password-stdin docker push ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-rts:${{steps.vars.outputs.tag}} # Build master Docker image and push to Docker Hub @@ -82,7 +82,7 @@ jobs: run: | docker build -t ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-rts:${GITHUB_SHA} . docker build -t ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-rts:nightly . - echo ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin + echo ${{ secrets.PACKAGES_WRITE_PASSWORD }} | docker login -u ${{ secrets.PACKAGES_WRITE_USERNAME }} --password-stdin docker push ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-rts:${GITHUB_SHA} docker push ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-rts:nightly diff --git a/.github/workflows/client-build.yml b/.github/workflows/client-build.yml index fc3bba2eff3..3e4d118bbbb 100644 --- a/.github/workflows/client-build.yml +++ b/.github/workflows/client-build.yml @@ -24,7 +24,7 @@ defaults: jobs: build: - runs-on: buildjet-8vcpu-ubuntu-2004 + runs-on: ubuntu-latest # Only run for internal PRs or commits to release or master if: | github.event.pull_request.head.repo.full_name == github.repository || diff --git a/.github/workflows/github-release.yml b/.github/workflows/github-release.yml index c5a33eb2b0a..d65f78bfa61 100644 --- a/.github/workflows/github-release.yml +++ b/.github/workflows/github-release.yml @@ -44,7 +44,7 @@ jobs: needs: - prelude - runs-on: buildjet-8vcpu-ubuntu-2004 + runs-on: ubuntu-latest defaults: run: diff --git a/.github/workflows/test-build-docker-image-fat.yml b/.github/workflows/test-build-docker-image-fat.yml index e90fbe9cb24..703bb283884 100644 --- a/.github/workflows/test-build-docker-image-fat.yml +++ b/.github/workflows/test-build-docker-image-fat.yml @@ -751,7 +751,33 @@ jobs: strategy: fail-fast: false matrix: - job: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23] + job: + [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + ] # Service containers to run with this job. Required for running tests services: @@ -1257,8 +1283,9 @@ jobs: - name: Login to DockerHub uses: docker/login-action@v1 with: - username: ${{ secrets.DOCKER_HUB_USERNAME }} - password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} + registry: ghcr.io + username: ${{ secrets.PACKAGES_WRITE_USERNAME }} + password: ${{ secrets.PACKAGES_WRITE_PASSWORD }} # Build release Docker image and push to Docker Hub - name: Push client release image to Docker Hub @@ -1267,7 +1294,6 @@ jobs: run: | docker build -t ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-editor:${{steps.vars.outputs.tag}} . # docker push ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-editor:${{steps.vars.outputs.tag}} - # Build master Docker image and push to Docker Hub - name: Push client master image to Docker Hub with commit tag if: success() && github.ref == 'refs/heads/master' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch') @@ -1332,7 +1358,6 @@ jobs: run: | docker build --build-arg APPSMITH_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY_RELEASE }} -t ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-server:${{steps.vars.outputs.tag}} . # docker push ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-server:${{steps.vars.outputs.tag}} - # Build master Docker image and push to Docker Hub - name: Push server master image to Docker Hub with commit tag if: success() && github.ref == 'refs/heads/master' @@ -1350,7 +1375,6 @@ jobs: run: | docker build -t ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-rts:${{steps.vars.outputs.tag}} . # docker push ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-rts:${{steps.vars.outputs.tag}} - # Build master Docker image and push to Docker Hub - name: Push RTS master image to Docker Hub with commit tag if: success() && github.ref == 'refs/heads/master' diff --git a/.github/workflows/test-build-docker-image.yml b/.github/workflows/test-build-docker-image.yml index ff7a72a5e09..a370e1e23ca 100644 --- a/.github/workflows/test-build-docker-image.yml +++ b/.github/workflows/test-build-docker-image.yml @@ -23,7 +23,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: buildjet-8vcpu-ubuntu-2004 + runs-on: ubuntu-latest defaults: run: working-directory: app/client @@ -423,7 +423,7 @@ jobs: strategy: fail-fast: false matrix: - job: [0, 1,] + job: [0, 1] # Service containers to run with this job. Required for running tests services: @@ -1309,8 +1309,9 @@ jobs: - name: Login to DockerHub uses: docker/login-action@v1 with: - username: ${{ secrets.DOCKER_HUB_USERNAME }} - password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} + registry: ghcr.io + username: ${{ secrets.PACKAGES_WRITE_USERNAME }} + password: ${{ secrets.PACKAGES_WRITE_PASSWORD }} # Build release Docker image and push to Docker Hub - name: Push client release image to Docker Hub