-
Notifications
You must be signed in to change notification settings - Fork 3
chore: update CI runners and dependencies for macOS and Windows #505
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
e9897d0
9181140
92a8cd2
d0b80a8
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -32,7 +32,7 @@ runs: | |
| if: runner.os == 'Windows' | ||
| shell: bash | ||
| run: | | ||
| choco install openssl --version 3.5.4 -y --no-progress | ||
|
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. aside: chocolatey removes versions pretty consistently. This one is gone, so the builds break. |
||
| choco install openssl --version 3.6.1 -y --no-progress | ||
| if [ -d "C:\Program Files\OpenSSL-Win64" ]; then | ||
| echo "OPENSSL_ROOT_DIR=C:\Program Files\OpenSSL-Win64" >> $GITHUB_OUTPUT | ||
| else | ||
|
|
||
|
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. aside: Adding an ARM arch release artifact. Previously it was only inter. aside: We may consider dropping the intel version, but probably not until apple drops it in their latest OS. |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -38,7 +38,7 @@ jobs: | |
| strategy: | ||
| matrix: | ||
| # Each of the platforms for which release-artifacts need generated. | ||
| os: [ ubuntu-22.04, windows-2022, macos-13 ] | ||
| os: [ ubuntu-22.04, windows-2022, macos-15-large ] | ||
|
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. aside: The large variant is intel. |
||
| runs-on: ${{ matrix.os }} | ||
| outputs: | ||
| hashes-linux: ${{ steps.release-sdk.outputs.hashes-linux }} | ||
|
|
@@ -58,6 +58,27 @@ jobs: | |
| github_token: ${{secrets.GITHUB_TOKEN}} | ||
| sdk_path: ${{ needs.split-input.outputs.sdk_path}} | ||
| sdk_cmake_target: ${{ needs.split-input.outputs.sdk_cmake_target}} | ||
|
|
||
| release-sdk-mac-arm64: | ||
| needs: split-input | ||
| runs-on: macos-15 | ||
| outputs: | ||
| hashes-macos-arm64: ${{ steps.release-sdk.outputs.hashes-macos }} | ||
| steps: | ||
| # https://github.com/actions/checkout/releases/tag/v4.3.0 | ||
| - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 | ||
| with: | ||
| ref: ${{ inputs.tag }} | ||
| - id: release-sdk | ||
| name: Full release of ${{ needs.split-input.outputs.sdk_path }} (macOS arm64) | ||
| uses: ./.github/actions/sdk-release | ||
| with: | ||
| tag_name: ${{ inputs.tag }} | ||
| github_token: ${{secrets.GITHUB_TOKEN}} | ||
| sdk_path: ${{ needs.split-input.outputs.sdk_path}} | ||
| sdk_cmake_target: ${{ needs.split-input.outputs.sdk_cmake_target}} | ||
| mac_artifact_arch: 'arm64' | ||
|
|
||
| release-sdk-provenance: | ||
| needs: [ 'release-sdk' ] | ||
| strategy: | ||
|
|
@@ -74,3 +95,16 @@ jobs: | |
| upload-assets: true | ||
| upload-tag-name: ${{ inputs.tag }} | ||
| provenance-name: ${{ format('{0}-multiple-provenance.intoto.jsonl', matrix.os) }} | ||
|
|
||
| release-sdk-mac-arm64-provenance: | ||
| needs: [ 'release-sdk-mac-arm64' ] | ||
| permissions: | ||
| actions: read | ||
| id-token: write | ||
| contents: write | ||
| uses: slsa-framework/slsa-github-generator/.github/workflows/generator_generic_slsa3.yml@v2.1.0 | ||
| with: | ||
| base64-subjects: "${{ needs.release-sdk-mac-arm64.outputs.hashes-macos-arm64 }}" | ||
| upload-assets: true | ||
| upload-tag-name: ${{ inputs.tag }} | ||
| provenance-name: 'macos-arm64-multiple-provenance.intoto.jsonl' | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
aside: Temporary PIN. Then there is a followup PR. I wanted to start with a cleanly working CI.