diff --git a/.github/workflows/flowctl-release.yaml b/.github/workflows/flowctl-release.yaml index 40b5e3dba7..7d06437d96 100644 --- a/.github/workflows/flowctl-release.yaml +++ b/.github/workflows/flowctl-release.yaml @@ -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 @@ -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 }} @@ -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 diff --git a/.github/workflows/flowctl-test.yaml b/.github/workflows/flowctl-test.yaml index c16be253f2..41ba254a9a 100644 --- a/.github/workflows/flowctl-test.yaml +++ b/.github/workflows/flowctl-test.yaml @@ -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 }} @@ -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