Skip to content

Commit

Permalink
CI Fix
Browse files Browse the repository at this point in the history
  • Loading branch information
caipira113 committed Mar 20, 2024
1 parent 1861c27 commit 5983265
Showing 1 changed file with 27 additions and 27 deletions.
54 changes: 27 additions & 27 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Get commit sha
run: echo "COMMIT_SHA=$(git rev-parse --short=7 HEAD)" >> $GITHUB_ENV
- name: Get os name
Expand All @@ -32,41 +32,41 @@ jobs:
echo "${{ secrets.SSH_PRIVATE_KEY }}" | ssh-add -
- name: Set up Docker Buildx for amd64
if: matrix.platform == 'linux/amd64'
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
with:
platforms: ${{ matrix.platform }}
- name: Set up Docker Buildx for arm64
if: matrix.platform == 'linux/arm64'
env:
SSH_AUTH_SOCK: /tmp/ssh_agent.sock
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
with:
platforms: ${{ matrix.platform }}
endpoint: ssh://${{ secrets.ARM_NODE_USER }}@${{ secrets.ARM_NODE_ADDR }}:${{ secrets.ARM_NODE_PORT }}
- name: Build and Push
- name: Build and export
id: buildx
env:
SSH_AUTH_SOCK: /tmp/ssh_agent.sock
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: .
provenance: false
platforms: ${{ matrix.platform }}
cache-from: type=gha
cache-to: type=gha,mode=max
# image to tar
outputs: type=local,dest=./${{ env.OS }}-image.tar
outputs: type=tar,dest=./${{ env.OS }}-image.tar
- name: Image ID Output
run: echo "${{ steps.buildx.outputs.imageid }}" > "${{ env.OS }}-image.id"
run: echo "${{ steps.buildx.outputs.imageid }}" > "${{ env.OS }}-image-id.txt"
- name: Upload image id
uses: actions/upload-artifact@v4
with:
name: ${{ env.OS }}-image-id
path: ${{ env.OS }}-image.id
name: ${{ env.OS }}-image-id.txt
path: ${{ env.OS }}-image-id.txt
- name: Upload image tar
uses: actions/upload-artifact@v4
with:
name: ${{ env.OS }}-image
name: ${{ env.OS }}-image.tar
path: ${{ env.OS }}-image.tar
tag-merge:
permissions:
Expand All @@ -77,51 +77,51 @@ jobs:
needs: build

steps:
- name: Download image id
- name: Download image id (amd64)
uses: actions/download-artifact@v4
with:
name: amd64-image.id
path: amd64-image.id
- name: Download image id
name: amd64-image-id.txt
path: amd64-image-id.txt
- name: Download image id (arm64)
uses: actions/download-artifact@v4
with:
name: arm64-image.id
path: arm64-image.id
- name: Download image tar
name: arm64-image-id.txt
path: arm64-image-id.txt
- name: Download image tar (amd64)
uses: actions/download-artifact@v4
with:
name: amd64-image
name: amd64-image.tar
path: amd64-image.tar
- name: Download image tar
- name: Download image tar (arm64)
uses: actions/download-artifact@v4
with:
name: arm64-image
name: arm64-image.tar
path: arm64-image.tar
- name: Set image id output
id: imageid
run: |
echo "amd64-image=$(cat amd64-image.id)" >> $GITHUB_OUTPUT
echo "arm64-image=$(cat arm64-image.id)" >> $GITHUB_OUTPUT
echo "amd64-image=$(cat amd64-image-id)" >> $GITHUB_OUTPUT
echo "arm64-image=$(cat arm64-image-id)" >> $GITHUB_OUTPUT
- name: Authenticate to Google Cloud
id: auth
uses: google-github-actions/auth@v1
uses: google-github-actions/auth@v2
with:
token_format: access_token
workload_identity_provider: ${{ secrets.IDENTITY_PROVIDER }}
service_account: ${{ secrets.SERVICE_ACCOUNT }}
- name: Login to Artifact Registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ${{ secrets.ARTIFACT_REGISTRY }}
username: oauth2accesstoken
password: ${{ steps.auth.outputs.access_token }}
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
- name: Load image
run: docker import ubuntu-image.tar
run: docker import amd64-image.tar
- name: Load image
run: docker import macos-image.tar
run: docker import arm64-image.tar
- name: Tag
run: |
docker manifest create \
Expand Down

0 comments on commit 5983265

Please sign in to comment.