From cb2bbcf5319dc66b39a4306699346a430a2a6fce Mon Sep 17 00:00:00 2001 From: Anton Hughes Date: Wed, 4 Dec 2024 11:48:25 +1300 Subject: [PATCH 1/3] remove debugging --- .github/workflows/docker.yml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 2ef7aa92..adfe078c 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -96,16 +96,13 @@ jobs: if: startsWith(matrix.cpu_arch, 'x86_64') run: echo "SHORT_ARCH=amd64" >> $GITHUB_ENV - - name: Debug short arch - run: echo "SHORT_ARCH=${{ env.SHORT_ARCH }}" - name: Install Rust and Cargo run: | curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y source $HOME/.cargo/env echo "PATH=$HOME/.cargo/bin:$PATH" >> $GITHUB_ENV - echo "rustup toolchain list is: $(rustup toolchain list)" - cargo --version + - name: cargo install cross run: | @@ -133,7 +130,7 @@ jobs: method: github githubToken: ${{ secrets.GH_TOKEN }} secrets: | - spesi_kv/data/dev/docker/anchor DOCKER_USERNAME ; + spesi_kv/data/dev/docker/anchor DOCKER_USERNAME spesi_kv/data/dev/docker/anchor DOCKER_PASSWORD - name: Dockerhub login @@ -144,12 +141,10 @@ jobs: run: | cargo install cross env CROSS_PROFILE=${{ matrix.profile }} make build-${{ matrix.cpu_arch }} - echo "### matrix.cpu_arch is ${{ matrix.cpu_arch }}" - echo "### matrix.profile is ${{ matrix.profile }}" + - name: Set `make` command for anchor run: | - echo "### cpu_arch is ${{ matrix.cpu_arch }}" echo "MAKE_CMD=build-${{ matrix.cpu_arch }}" >> $GITHUB_ENV - name: Make bin dir From ebc6d86d495bc9de7546b36d34dae97ab799389c Mon Sep 17 00:00:00 2001 From: Anton Hughes Date: Wed, 4 Dec 2024 11:49:13 +1300 Subject: [PATCH 2/3] remove debugging --- .github/workflows/docker.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index adfe078c..2f329379 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -83,10 +83,6 @@ jobs: VERSION: ${{ needs.extract-version.outputs.VERSION }} VERSION_SUFFIX: ${{ needs.extract-version.outputs.VERSION_SUFFIX }} steps: - - name: Debug extract-version output - run: | - echo "[docker.yml] VERSION: ${{ needs.extract-version.outputs.VERSION }}" - echo "[docker.yml] VERSION_SUFFIX: ${{ needs.extract-version.outputs.VERSION_SUFFIX }}" - name: Map aarch64 to arm64 short arch if: startsWith(matrix.cpu_arch, 'aarch64') From 5036e06b0d525905e0d13d80ce0d5dcc3d3a0344 Mon Sep 17 00:00:00 2001 From: Anton Hughes Date: Wed, 4 Dec 2024 11:54:22 +1300 Subject: [PATCH 3/3] remove unneeded job --- .github/workflows/docker.yml | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 2f329379..8bee8a6b 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -175,31 +175,3 @@ jobs: RUST_VERSION=${{ env.RUST_VERSION }} TARGETPLATFORM=linux/${{ env.SHORT_ARCH }} GIT_COMMIT_HASH=${{ github.sha }} - - build-docker-multiarch: - name: build-docker-anchor-multiarch - runs-on: ubuntu-22.04 - strategy: - matrix: - binary: [anchor] - needs: [build-docker-single-arch, extract-version] - env: - VERSION: ${{ needs.extract-version.outputs.VERSION }} - VERSION_SUFFIX: ${{ needs.extract-version.outputs.VERSION_SUFFIX }} - steps: - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Retrieve Docker credentials from Vault - uses: hashicorp/vault-action@v2 - with: - url: https://vault.sigp.io - method: github - githubToken: ${{ secrets.GH_TOKEN }} - secrets: | - spesi_kv/data/dev/docker/anchor DOCKER_USERNAME ; - spesi_kv/data/dev/docker/anchor DOCKER_PASSWORD - - - name: Dockerhub login - run: | - echo "${DOCKER_PASSWORD}" | docker login --username ${DOCKER_USERNAME} --password-stdin