Skip to content

Commit

Permalink
Improve action logging and move back to ubuntu instead of osx due to …
Browse files Browse the repository at this point in the history
…M1 does not support nested virtualization
  • Loading branch information
donhardman committed May 31, 2024
1 parent 2b6b53e commit f7cc2b8
Showing 1 changed file with 16 additions and 8 deletions.
24 changes: 16 additions & 8 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,25 +43,30 @@ jobs:
echo "deb_suffix=-${date}-$commit" >> $GITHUB_OUTPUT
build-artifact:
name: ${{ matrix.name }}
runs-on: ${{ matrix.os }}
needs:
- vars
strategy:
matrix:
include:
- os: ubuntu-22.04
- name: AMD64 with buildx for Linux
os: ubuntu-22.04
arch: amd64
use_buildx: true
run: ""
- os: macos-14
- name: ARM64 with buildx for Linux
os: ubuntu-22.04
arch: arm64
use_buildx: true
run: ""
- os: macos-13
- name: AMD64 native on OSX
os: macos-13
arch: x86_64
use_buildx: false
run: ./build-osx
- os: macos-14
- name: ARM64 native on OSX
os: macos-14
arch: arm64
use_buildx: false
run: ./build-osx
Expand All @@ -70,7 +75,7 @@ jobs:
uses: actions/checkout@v3
- name: Set up Docker Buildx
if: ${{ matrix.use_buildx == true }}
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
- name: Build docker image
if: ${{ matrix.use_buildx == true }}
uses: docker/build-push-action@v3
Expand Down Expand Up @@ -808,17 +813,20 @@ jobs:
delimiter: ${{ matrix.delimiter }}

deploy-docker:
name: ${{ matrix.name }}
runs-on: ${{ matrix.os }}
needs:
- vars
- deploy
strategy:
matrix:
include:
- arch: amd64
- name: Deploy docker amd64
arch: amd64
os: ubuntu-22.04
- name: Deploy docker arm64
arch: arm64
os: ubuntu-22.04
- arch: arm64
os: macos-14
steps:
- name: Checkout
uses: actions/checkout@v3
Expand Down

0 comments on commit f7cc2b8

Please sign in to comment.