From 0f7c0cd4b37d6dfa5ba1a2137fef8297d384bddd Mon Sep 17 00:00:00 2001 From: "Sean P. Kelly" Date: Thu, 10 Oct 2024 19:05:20 +0000 Subject: [PATCH 1/2] ci: install golang in attribution upload action This action requires the krane-bundle crate to build, so needs golang. --- .github/workflows/release.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6ae83d20..4568ea98 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -157,7 +157,9 @@ jobs: ${{ needs.create-release.outputs.has-releases == 'true' && github.repository == 'bottlerocket-os/twoliter' }} - runs-on: ubuntu-latest + runs-on: + group: bottlerocket + labels: bottlerocket_ubuntu-latest_8-core env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_REF_NAME: ${{ github.ref_name }} @@ -166,6 +168,9 @@ jobs: - uses: actions/checkout@v3 with: submodules: recursive + - uses: actions/setup-go@v5 + with: + go-version: "^1.18" - name: Upload attributions run: | make attributions From 8e47bb3c4c173efd5d62d506b6995b13f457956a Mon Sep 17 00:00:00 2001 From: "Sean P. Kelly" Date: Thu, 10 Oct 2024 19:07:40 +0000 Subject: [PATCH 2/2] twoliter: bump to 0.5.0-rc2 --- Cargo.lock | 2 +- Cargo.toml | 2 +- twoliter/Cargo.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3ce64615..4f99b759 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3866,7 +3866,7 @@ dependencies = [ [[package]] name = "twoliter" -version = "0.5.0-rc1" +version = "0.5.0-rc2" dependencies = [ "anyhow", "async-recursion", diff --git a/Cargo.toml b/Cargo.toml index 9b4af953..293f62c6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -51,7 +51,7 @@ pubsys-setup = { version = "0.1", path = "tools/pubsys-setup", artifact = [ "bin testsys = { version = "0.1", path = "tools/testsys", artifact = [ "bin:testsys" ] } testsys-config = { version = "0.1", path = "tools/testsys-config" } testsys-model = { version = "0.0.14", git = "/~https://github.com/bottlerocket-os/bottlerocket-test-system", tag = "v0.0.14" } -twoliter = { version = "0.5.0-rc1", path = "twoliter", artifact = [ "bin:twoliter" ] } +twoliter = { version = "0.5.0-rc2", path = "twoliter", artifact = [ "bin:twoliter" ] } unplug = { version = "0.1", path = "tools/unplug", artifact = [ "bin:unplug" ] } update-metadata = { version = "0.1", path = "tools/update-metadata" } diff --git a/twoliter/Cargo.toml b/twoliter/Cargo.toml index 1f13d3dd..9cc54e28 100644 --- a/twoliter/Cargo.toml +++ b/twoliter/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "twoliter" -version = "0.5.0-rc1" +version = "0.5.0-rc2" edition = "2021" description = "A command line tool for creating custom builds of Bottlerocket" authors = ["Matthew James Briggs "]