Skip to content

Commit

Permalink
Merge pull request #646 from trheyi/main
Browse files Browse the repository at this point in the history
refactor: Update Docker image versions and artifact upload actions
  • Loading branch information
trheyi committed Jul 4, 2024
2 parents 42dad32 + 18b6aae commit 7a32e5b
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/build-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Get Version
run: |
Expand All @@ -28,19 +28,19 @@ jobs:
run: echo $VERSION

- name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v3

- name: Login to DockerHub
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.DOCKER_TOKEN }}

- name: Build Development
uses: docker/build-push-action@v2
uses: docker/build-push-action@v6
with:
context: ./docker/development
platforms: linux/amd64
Expand All @@ -51,7 +51,7 @@ jobs:
tags: yaoapp/yao:${{ env.VERSION }}-amd64-dev

- name: Build Development Arm64
uses: docker/build-push-action@v2
uses: docker/build-push-action@v6
with:
context: ./docker/development
platforms: linux/arm64
Expand All @@ -62,7 +62,7 @@ jobs:
tags: yaoapp/yao:${{ env.VERSION }}-arm64-dev

- name: Build Production
uses: docker/build-push-action@v2
uses: docker/build-push-action@v6
with:
context: ./docker/production
platforms: linux/amd64
Expand All @@ -73,7 +73,7 @@ jobs:
tags: yaoapp/yao:${{ env.VERSION }}-amd64

- name: Build Production Arm64
uses: docker/build-push-action@v2
uses: docker/build-push-action@v6
with:
context: ./docker/production
platforms: linux/arm64
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-receive.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
echo ${{ github.event.number }} > ./pr/NR
echo ${{ github.event.pull_request.head.sha }} > ./pr/SHA
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: pr
path: pr/

0 comments on commit 7a32e5b

Please sign in to comment.