From c7b03e959bdd1680e67a7ed35ef2f975eeea0cc4 Mon Sep 17 00:00:00 2001 From: Gabriel Montes Date: Mon, 30 Dec 2024 12:36:52 -0300 Subject: [PATCH] Improve CI --- .github/actions/setup-repo/action.yml | 2 +- .github/workflows/config.yml | 4 ++-- .../workflows/publish-docker-image-every-push.yml | 13 ++++++++----- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/actions/setup-repo/action.yml b/.github/actions/setup-repo/action.yml index 5b2149aff20e..b613f9ee028b 100644 --- a/.github/actions/setup-repo/action.yml +++ b/.github/actions/setup-repo/action.yml @@ -20,7 +20,7 @@ inputs: docker-image: description: 'Docker image' required: true - default: blockscout/blockscout + default: hemilabs/blockscout outputs: docker-builder: description: 'Docker builder' diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml index e9fdb93c59e0..445aaf5206e5 100644 --- a/.github/workflows/config.yml +++ b/.github/workflows/config.yml @@ -10,7 +10,7 @@ on: - production-filecoin - production-fuse - production-optimism - - production-optimism-stg # Hemi default branch + - production-hemi # Hemi default branch - production-immutable - production-iota - production-lukso @@ -29,7 +29,7 @@ on: pull_request: types: [opened, synchronize, reopened, labeled] branches: - - production-hemi + - master env: MIX_ENV: test diff --git a/.github/workflows/publish-docker-image-every-push.yml b/.github/workflows/publish-docker-image-every-push.yml index 90dca84f3bb8..e9cdf3e7b705 100644 --- a/.github/workflows/publish-docker-image-every-push.yml +++ b/.github/workflows/publish-docker-image-every-push.yml @@ -3,7 +3,7 @@ name: Publish Docker image on every push to default branch on: push: branches: - - production-optimism-stg # Hemi default branch + - production-hemi # Hemi default branch workflow_dispatch: env: @@ -55,6 +55,7 @@ jobs: AMPLITUDE_API_KEY= BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta.+commit.${{ env.SHORT_SHA }} RELEASE_VERSION=${{ env.RELEASE_VERSION }} + CHAIN_TYPE=optimism - name: Build and push Docker image (indexer) uses: docker/build-push-action@v5 @@ -62,7 +63,7 @@ jobs: context: . file: ./docker/Dockerfile push: true - tags: blockscout/blockscout:${{ env.RELEASE_VERSION }}.commit.${{ env.SHORT_SHA }}-indexer + tags: hemilabs/blockscout:${{ env.RELEASE_VERSION }}.commit.${{ env.SHORT_SHA }}-indexer labels: ${{ steps.setup.outputs.docker-labels }} platforms: | linux/amd64 @@ -89,7 +90,7 @@ jobs: context: . file: ./docker/Dockerfile push: true - tags: blockscout/blockscout:${{ env.RELEASE_VERSION }}.commit.${{ env.SHORT_SHA }}-api + tags: hemilabs/blockscout:${{ env.RELEASE_VERSION }}.commit.${{ env.SHORT_SHA }}-api labels: ${{ steps.setup.outputs.docker-labels }} platforms: | linux/amd64 @@ -133,6 +134,8 @@ jobs: SESSION_COOKIE_DOMAIN=k8s-dev.blockscout.com BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta.+commit.${{ env.SHORT_SHA }} RELEASE_VERSION=${{ env.RELEASE_VERSION }} + CHAIN_TYPE=optimism + deploy_e2e: needs: push_to_registry runs-on: ubuntu-latest @@ -162,7 +165,7 @@ jobs: client_payload: '{ "instance": "dev", "globalEnv": "e2e"}' # This job tries to deploy the new built images to k8s. But we don't have # such setup in the Hemi setup. Disabling instead of deleting to keep this - # as referenence for potential future improvements. + # as reference for potential future improvements. if: false test: needs: deploy_e2e @@ -173,5 +176,5 @@ jobs: id-token: write # This job tries to run tests in the deployed k8s setup. But we don't have # such setup in the Hemi setup. Disabling instead of deleting to keep this - # as referenence for potential future improvements. + # as reference for potential future improvements. if: false \ No newline at end of file