Skip to content

Commit

Permalink
.github/workflows: use macos-14 (latest appears to resolve to 12)
Browse files Browse the repository at this point in the history
Also, `protoc` isn't required to build `flowctl`.
  • Loading branch information
jgraettinger committed Apr 20, 2024
1 parent 58b6948 commit 54cc9b2
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 13 deletions.
10 changes: 3 additions & 7 deletions .github/workflows/flowctl-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,12 @@ jobs:
assetName: flowctl-x86_64-linux
# On mac, it's the opposite. Programs built on the latest macos can run on older versions,
# but not the other way around.
- os: macos-latest
- os: macos-14
assetName: flowctl-multiarch-macos
steps:
- name: Checkout code
uses: actions/checkout@v2
- uses: dtolnay/rust-toolchain@stable
- name: Install Protoc
uses: arduino/setup-protoc@v1
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}

# Linux build steps:
- name: Build Linux
Expand All @@ -42,7 +38,7 @@ jobs:
# Mac build steps:
- name: Setup mac signing certificate
if: matrix.config.os == 'macos-latest'
if: matrix.config.os == 'macos-14'
env:
MAC_SIGNING_CERTIFICATE_BASE64: ${{ secrets.MAC_SIGNING_CERTIFICATE_BASE64 }}
MAC_CERTIFICATE_PASSWORD: ${{ secrets.MAC_CERTIFICATE_PASSWORD }}
Expand Down Expand Up @@ -72,7 +68,7 @@ jobs:
# This one mac build runs on both intel and m1 macs
- name: Build Mac
if: matrix.config.os == 'macos-latest'
if: matrix.config.os == 'macos-14'
env:
MAC_CERTIFICATE_IDENTITY: ${{ secrets.MAC_CERTIFICATE_IDENTITY }}
# The toolchain action always gives you the default target, but we always need both
Expand Down
9 changes: 3 additions & 6 deletions .github/workflows/flowctl-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ name: Flowctl Tests on macos
on:
push:
paths:
- "crates/flowctl/**"
- ".github/workflows/flowctl-test.yaml"
- "Cargo.lock"
- "crates/flowctl/**"

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand All @@ -15,14 +16,10 @@ concurrency:
jobs:
test:
name: Test flowctl on macos
runs-on: macos-latest
runs-on: macos-14
steps:
- name: Checkout code
uses: actions/checkout@v2
- name: Install Protoc
uses: arduino/setup-protoc@v1
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- uses: dtolnay/rust-toolchain@stable
- name: Run tests
run: cargo test -p flowctl

0 comments on commit 54cc9b2

Please sign in to comment.