waalge
/
aiken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use ubuntu-22.04 for linux releases, and add musl target. 

This should fix the openssl linking issue, as well as provide an alternative linux build that should be fully static.
This commit is contained in:
KtorZ 2024-07-01 17:34:07 +02:00
parent 8b86ee8219
commit 5da7db355f
No known key found for this signature in database
GPG Key ID: 33173CB6F77F4277
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.github/workflows/release.yml vendored
View File

@ -157,7 +157,7 @@ jobs:
needs: needs:
- plan - plan
- build-local-artifacts - build-local-artifacts
runs-on: "ubuntu-20.04" runs-on: ubuntu-latest
env: env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
BUILD_MANIFEST_NAME: target/distrib/global-dist-manifest.json BUILD_MANIFEST_NAME: target/distrib/global-dist-manifest.json
@ -204,7 +204,7 @@ jobs:
if: ${{ always() && needs.plan.outputs.publishing == 'true' && (needs.build-global-artifacts.result == 'skipped' || needs.build-global-artifacts.result == 'success') && (needs.build-local-artifacts.result == 'skipped' || needs.build-local-artifacts.result == 'success') }} if: ${{ always() && needs.plan.outputs.publishing == 'true' && (needs.build-global-artifacts.result == 'skipped' || needs.build-global-artifacts.result == 'success') && (needs.build-local-artifacts.result == 'skipped' || needs.build-local-artifacts.result == 'success') }}
env: env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
runs-on: "ubuntu-20.04" runs-on: ubuntu-latest
outputs: outputs:
val: ${{ steps.host.outputs.manifest }} val: ${{ steps.host.outputs.manifest }}
steps: steps:
@ -239,7 +239,7 @@ jobs:
needs: needs:
- plan - plan
- host - host
runs-on: "ubuntu-20.04" runs-on: ubuntu-latest
env: env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
PLAN: ${{ needs.plan.outputs.val }} PLAN: ${{ needs.plan.outputs.val }}
@ -279,7 +279,7 @@ jobs:
needs: needs:
- plan - plan
- host - host
runs-on: "ubuntu-20.04" runs-on: ubuntu-latest
env: env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
PLAN: ${{ needs.plan.outputs.val }} PLAN: ${{ needs.plan.outputs.val }}
@ -314,7 +314,7 @@ jobs:
# still allowing individual publish jobs to skip themselves (for prereleases). # still allowing individual publish jobs to skip themselves (for prereleases).
# "host" however must run to completion, no skipping allowed! # "host" however must run to completion, no skipping allowed!
if: ${{ always() && needs.host.result == 'success' && (needs.publish-homebrew-formula.result == 'skipped' || needs.publish-homebrew-formula.result == 'success') && (needs.publish-npm.result == 'skipped' || needs.publish-npm.result == 'success') }} if: ${{ always() && needs.host.result == 'success' && (needs.publish-homebrew-formula.result == 'skipped' || needs.publish-homebrew-formula.result == 'success') && (needs.publish-npm.result == 'skipped' || needs.publish-npm.result == 'success') }}
runs-on: "ubuntu-20.04" runs-on: ubuntu-latest
env: env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
steps: steps:

7
Cargo.toml
View File

@ -21,6 +21,7 @@ targets = [
"aarch64-apple-darwin", "aarch64-apple-darwin",
"x86_64-apple-darwin", "x86_64-apple-darwin",
"x86_64-unknown-linux-gnu", "x86_64-unknown-linux-gnu",
"x86_64-unknown-linux-musl",
"x86_64-pc-windows-msvc", "x86_64-pc-windows-msvc",
] ]
# The archive format to use for windows builds (defaults .zip) # The archive format to use for windows builds (defaults .zip)
@ -38,6 +39,12 @@ install-updater = false
install-path = "~/.aiken/bin/" install-path = "~/.aiken/bin/"
publish-prereleases = true publish-prereleases = true
# Cargo-dist uses ubuntu-20.04 by default, causing issues in various cases
# because it links with openssl-1.1 whereas recent distro ships with 3.x
[workspace.metadata.dist.github-custom-runners]
x86_64-unknown-linux-gnu = "ubuntu-22.04"
x86_64-unknown-linux-musl = "ubuntu-22.04"
[workspace.dependencies] [workspace.dependencies]
walkdir = "2.3.2" walkdir = "2.3.2"
pallas = "0.22.0" pallas = "0.22.0"