Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove redundant docker job #48

Merged
merged 4 commits into from
Dec 3, 2024
Merged

Remove redundant docker job #48

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cb2bbcf
remove debugging
magick93 Dec 3, 2024
ebc6d86
remove debugging
magick93 Dec 3, 2024
5036e06
remove unneeded job
magick93 Dec 3, 2024
43685bb
Merge pull request #47 from magick93/releases-from-docker
magick93 Dec 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 3 additions & 40 deletions .github/workflows/docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand All @@ -96,16 +92,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: |
Expand Down Expand Up @@ -133,7 +126,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
Expand All @@ -144,12 +137,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
Expand Down Expand Up @@ -184,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
Loading