diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7613a032..eb49a41c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -157,7 +157,7 @@ jobs: needs: - plan - build-local-artifacts - runs-on: "ubuntu-20.04" + runs-on: ubuntu-latest env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} 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') }} env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - runs-on: "ubuntu-20.04" + runs-on: ubuntu-latest outputs: val: ${{ steps.host.outputs.manifest }} steps: @@ -239,7 +239,7 @@ jobs: needs: - plan - host - runs-on: "ubuntu-20.04" + runs-on: ubuntu-latest env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} PLAN: ${{ needs.plan.outputs.val }} @@ -279,7 +279,7 @@ jobs: needs: - plan - host - runs-on: "ubuntu-20.04" + runs-on: ubuntu-latest env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} PLAN: ${{ needs.plan.outputs.val }} @@ -314,7 +314,7 @@ jobs: # still allowing individual publish jobs to skip themselves (for prereleases). # "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') }} - runs-on: "ubuntu-20.04" + runs-on: ubuntu-latest env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: diff --git a/Cargo.toml b/Cargo.toml index d2d1b990..3f152edf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,6 +21,7 @@ targets = [ "aarch64-apple-darwin", "x86_64-apple-darwin", "x86_64-unknown-linux-gnu", + "x86_64-unknown-linux-musl", "x86_64-pc-windows-msvc", ] # The archive format to use for windows builds (defaults .zip) @@ -38,6 +39,12 @@ install-updater = false install-path = "~/.aiken/bin/" 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] walkdir = "2.3.2" pallas = "0.22.0"