Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# This file was autogenerated by dist: https://opensource.axo.dev/cargo-dist/
#
# Copyright 2022-2024, axodotdev
# Copyright 2025, Oxide Computer Company
# SPDX-License-Identifier: MIT or Apache-2.0
#
# CI that:
Expand Down Expand Up @@ -49,7 +50,7 @@ on:
jobs:
# Run 'dist plan' (or host) to determine what tasks we need to do
plan:
runs-on: "ubuntu-24.04"
runs-on: "ubuntu-22.04"
outputs:
val: ${{ steps.plan.outputs.manifest }}
tag: ${{ !github.event.pull_request && github.ref_name || '' }}
Expand All @@ -65,7 +66,7 @@ jobs:
# we specify bash to get pipefail; it guards against the `curl` command
# failing. otherwise `sh` won't catch that `curl` returned non-0
shell: bash
run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/v1.0.0-rc.2/dist-installer.sh | sh"
run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/oxidecomputer/cargo-dist/releases/download/v1.0.1/dist-installer.sh | sh"
- name: Cache dist
uses: actions/upload-artifact@v4
with:
Expand Down Expand Up @@ -174,7 +175,7 @@ jobs:
needs:
- plan
- build-local-artifacts
runs-on: "ubuntu-24.04"
runs-on: "ubuntu-22.04"
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
BUILD_MANIFEST_NAME: target/distrib/global-dist-manifest.json
Expand Down Expand Up @@ -224,7 +225,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-24.04"
runs-on: "ubuntu-22.04"
outputs:
val: ${{ steps.host.outputs.manifest }}
steps:
Expand Down Expand Up @@ -288,7 +289,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' }}
runs-on: "ubuntu-24.04"
runs-on: "ubuntu-22.04"
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
steps:
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

Nothing Yet!

# Version 1.0.2 (2025-06-19)

## Fixes

- Fix the other place the minimum glibc version is set.

# Version 1.0.1 (2025-06-17)

## Fixes
Expand Down
6 changes: 3 additions & 3 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ edition = "2021"
license = "MIT OR Apache-2.0"
repository = "https://github.com/oxidecomputer/cargo-dist"
homepage = "https://opensource.axo.dev/cargo-dist/"
version = "1.0.1"
version = "1.0.2"
rust-version = "1.74"

[workspace.dependencies]
# intra-workspace deps (you need to bump these versions when you cut releases too!
dist-schema = { version = "=1.0.1", path = "cargo-dist-schema" }
axoproject = { version = "=1.0.1", path = "axoproject", default-features = false, features = ["cargo-projects", "generic-projects", "npm-projects"] }
dist-schema = { version = "=1.0.2", path = "cargo-dist-schema" }
axoproject = { version = "=1.0.2", path = "axoproject", default-features = false, features = ["cargo-projects", "generic-projects", "npm-projects"] }

# vendored first-party deps
axocli = { version = "0.2.0", path = "vendor/axocli" }
Expand Down
2 changes: 1 addition & 1 deletion cargo-dist-schema/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ impl Default for GlibcVersion {
Self {
// Values from the default Ubuntu runner
major: 2,
series: 31,
series: 35,
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion cargo-dist/src/platform.rs
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ impl LibcVersion {
/// Get the default glibc version for cases where we just need to guess
/// and make one up.
///
/// This is the glibc of Ubuntu 20.04, which is the oldest supported
/// This is the glibc of Ubuntu 22.04, which is the oldest supported
/// github linux runner, as of this writing.
pub fn default_glibc() -> Self {
Self {
Expand Down
Loading