From 5bf3390b7dbcd3ec6f77cd9ba154e893e17b61d6 Mon Sep 17 00:00:00 2001 From: Donald Hutchison Date: Tue, 13 Feb 2024 14:36:05 +0100 Subject: [PATCH] Remove dead links from nav. (#1026) * Remove dead links from nav. * Mix format. * Update container ci-cd jobs to use self-hosted runners * Bump cache version. * Restore container option * Bumped cache * Add workflow permissions --------- Co-authored-by: Javier Cortejoso --- .github/workflows/blockscout.yml | 101 ++++++++++++++------- apps/block_scout_web/config/navigation.exs | 13 +-- 2 files changed, 70 insertions(+), 44 deletions(-) diff --git a/.github/workflows/blockscout.yml b/.github/workflows/blockscout.yml index 4017e0bc83b6..ff12358ccfab 100644 --- a/.github/workflows/blockscout.yml +++ b/.github/workflows/blockscout.yml @@ -20,12 +20,12 @@ env: ACCOUNT_AUTH0_DOMAIN: 'blockscoutcom.us.auth0.com' ACCOUNT_AUTH0_LOGOUT_URL: 'https://blockscoutcom.us.auth0.com/v2/logout' ACCOUNT_AUTH0_LOGOUT_RETURN_URL: 'https://blockscout.com/auth/logout' - CACHE_VERSION: 20 + CACHE_VERSION: 22 jobs: build-and-cache: name: Build and Cache deps - runs-on: [ '8-cpu','self-hosted', 'blockscout'] + runs-on: [ '8-cpu', 'self-hosted', 'blockscout'] container: image: us-west1-docker.pkg.dev/devopsre/actions-runner-controller/blockscout:latest options: --user root @@ -699,7 +699,6 @@ jobs: name: Wallaby screenshots path: apps/block_scout_web/screenshots/*.png - publish-test-results: name: "Publish Unit Tests Results" runs-on: ['self-hosted', '8-cpu', 'blockscout'] @@ -745,35 +744,71 @@ jobs: echo "tag=${{ github.ref != 'ref/heads/main' && 'testing' || 'latest' }}" >> $GITHUB_OUTPUT echo "sha=${{ github.ref != 'ref/heads/main' && github.event.pull_request.head.sha || github.sha }}" >> $GITHUB_OUTPUT - - Build-Blockscout: - uses: celo-org/reusable-workflows/.github/workflows/container-cicd.yaml@v2.0 + build-blockscout-container: + runs-on: ['self-hosted', '8-cpu', 'blockscout'] + container: + image: us-west1-docker.pkg.dev/devopsre/actions-runner-controller/blockscout:latest + options: --user root needs: [set-docker-vars] - with: - workload-id-provider: ${{ needs.set-docker-vars.outputs.workload-id-provider }} - service-account: ${{ needs.set-docker-vars.outputs.service-account }} - artifact-registry: "${{ needs.set-docker-vars.outputs.artifact-registry }}/blockscout" - tags: ${{ needs.set-docker-vars.outputs.tag }} - context: . - file: docker/Dockerfile - build-args: | - "FORCE_MIX_COMPILE_CACHE_MISS=${{ needs.set-docker-vars.outputs.sha }}" - trivy: true - - - Build-Blockscout-api: - uses: celo-org/reusable-workflows/.github/workflows/container-cicd.yaml@v2.0 + permissions: + contents: read + id-token: write + security-events: write + steps: + - name: 'Checkout' + uses: actions/checkout@v4 + - name: Authenticate to Google Cloud + uses: celo-org/reusable-workflows/.github/actions/auth-gcp-artifact-registry@v2.0.1 + with: + workload-id-provider: ${{ needs.set-docker-vars.outputs.workload-id-provider }} + service-account: ${{ needs.set-docker-vars.outputs.service-account }} + access-token-lifetime: "20m" + docker-gcp-registries: "us-west1-docker.pkg.dev" + - name: Build, push and scan the container + uses: celo-org/reusable-workflows/.github/actions/build-container@main + with: + platforms: linux/amd64 + registry: "${{ needs.set-docker-vars.outputs.artifact-registry }}/blockscout" + tags: ${{ needs.set-docker-vars.outputs.tag }} + context: . + dockerfile: docker/Dockerfile + build-args: | + "FORCE_MIX_COMPILE_CACHE_MISS=${{ needs.set-docker-vars.outputs.sha }}" + push: true + trivy: true + + build-blockscout-api-container: + runs-on: ['self-hosted', '8-cpu', 'blockscout'] + container: + image: us-west1-docker.pkg.dev/devopsre/actions-runner-controller/blockscout:latest + options: --user root needs: [set-docker-vars] - with: - workload-id-provider: ${{ needs.set-docker-vars.outputs.workload-id-provider }} - service-account: ${{ needs.set-docker-vars.outputs.service-account }} - artifact-registry: "${{ needs.set-docker-vars.outputs.artifact-registry }}/blockscout-api" - tags: ${{ needs.set-docker-vars.outputs.tag }} - context: . - file: docker/Dockerfile - build-args: | - "FORCE_MIX_COMPILE_CACHE_MISS=${{ needs.set-docker-vars.outputs.sha }}" - "DISABLE_WRITE_API=true", - "DISABLE_INDEXER=true", - "DISABLE_WEBAPP=true", - trivy: true + permissions: + contents: read + id-token: write + security-events: write + steps: + - name: 'Checkout' + uses: actions/checkout@v4 + - name: Authenticate to Google Cloud + uses: celo-org/reusable-workflows/.github/actions/auth-gcp-artifact-registry@v2.0.1 + with: + workload-id-provider: ${{ needs.set-docker-vars.outputs.workload-id-provider }} + service-account: ${{ needs.set-docker-vars.outputs.service-account }} + access-token-lifetime: "20m" + docker-gcp-registries: "us-west1-docker.pkg.dev" + - name: Build, push and scan the container + uses: celo-org/reusable-workflows/.github/actions/build-container@main + with: + platforms: linux/amd64 + registry: "${{ needs.set-docker-vars.outputs.artifact-registry }}/blockscout" + tags: ${{ needs.set-docker-vars.outputs.tag }} + context: . + dockerfile: docker/Dockerfile + build-args: | + "FORCE_MIX_COMPILE_CACHE_MISS=${{ needs.set-docker-vars.outputs.sha }}" + "DISABLE_WRITE_API=true", + "DISABLE_INDEXER=true", + "DISABLE_WEBAPP=true", + push: true + trivy: true diff --git a/apps/block_scout_web/config/navigation.exs b/apps/block_scout_web/config/navigation.exs index 2bd8413d200d..ed151374884f 100644 --- a/apps/block_scout_web/config/navigation.exs +++ b/apps/block_scout_web/config/navigation.exs @@ -3,8 +3,6 @@ import Config config :block_scout_web, defi: [ %{title: "Moola", url: "https://moola.market/"}, - %{title: "Pinnata", url: "https://www.pinnata.xyz/farm#/"}, - %{title: "GoodGhosting", url: "https://goodghosting.com/"}, %{title: "Revo", url: "https://revo.market/"}, %{title: "ImmortalDao Finance", url: "https://www.immortaldao.finance"} ], @@ -18,15 +16,11 @@ config :block_scout_web, wallet_list: [ %{title: "Valora", url: "https://valoraapp.com/"}, %{title: "Celo Terminal", url: "https://celoterminal.com/"}, - %{title: "Celo Wallet", url: "https://celowallet.app/"}, - %{title: "Node Wallet", url: "https://www.nodewallet.xyz/"} + %{title: "Celo Wallet", url: "https://celowallet.app/"} ], nft_list: [ - %{title: "Niftydrop", url: "https://niftydrop.net/"}, %{title: "NFT Viewer", url: "https://nfts.valoraapp.com/"}, - %{title: "Cyberbox", url: "https://cyberbox.art/"}, - %{title: "Nomspace", url: "https://nom.space/"}, - %{title: "Alities", url: "https://alities.io/"} + %{title: "Nomspace", url: "https://nom.space/"} ], connect_list: [ %{title: "impactMarket", url: "https://impactmarket.com/"}, @@ -40,20 +34,17 @@ config :block_scout_web, ], finance_tools_list: [ %{title: "Celo Tracker", url: "https://celotracker.com/"}, - %{title: "celo.tax", url: "https://celo.tax/"}, %{title: "Trelis", url: "https://trelis.com/"} ], resources: [ %{title: "Celo Vote", url: "https://celovote.com/"}, %{title: "Celo Forum", url: "https://forum.celo.org/"}, %{title: "TheCelo", url: "https://thecelo.com/"}, - %{title: "Validators", url: "https://celo.org/validators/explore"}, %{title: "Celo Reserve", url: "https://celoreserve.org/"}, %{title: "Celo Docs", url: "https://docs.celo.org/"} ], learning: [ %{title: "Celo Whitepaper", url: "https://celo.org/papers/whitepaper"}, - %{title: "Learn Celo", url: "https://learn.figment.io/protocols/celo"}, %{title: "Coinbase Earn", url: "https://www.coinbase.com/price/celo"} ], other_networks: [