From b2703b40dc6b833b937ab463ca05418d54e27b26 Mon Sep 17 00:00:00 2001 From: Neal Date: Thu, 19 Sep 2024 13:08:10 -0700 Subject: [PATCH 1/5] update-cli-token --- .github/workflows/release.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index db92ad05..d572c62c 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -22,7 +22,7 @@ jobs: build_cli_aarch64-apple-darwin: runs-on: macos-latest - name: aarch64-apple-darwin + name: cli-aarch64-apple-darwin steps: - uses: actions/checkout@v2 - name: Install Rust 1.74.0 @@ -37,11 +37,11 @@ jobs: uses: AButler/upload-release-assets@v3.0 with: files: web5_cli-aarch64-apple-darwin - repo-token: ${{ secrets.TBD_RELEASE_GITHUB_PERSONAL_ACCESS_TOKEN }} + repo-token: ${{ secrets.GITHUB_TOKEN }} build_cli_x86_64_apple_darwin: runs-on: macos-12 - name: x86_64-apple-darwin + name: cli-x86_64-apple-darwin steps: - uses: actions/checkout@v2 - name: Install Rust 1.74.0 @@ -56,11 +56,11 @@ jobs: uses: AButler/upload-release-assets@v3.0 with: files: web5_cli-x86_64-apple-darwin - repo-token: ${{ secrets.TBD_RELEASE_GITHUB_PERSONAL_ACCESS_TOKEN }} + repo-token: ${{ secrets.GITHUB_TOKEN }} build_cli_x86_64_unknown_linux_gnu: runs-on: ubuntu-latest - name: x86_64-unknown-linux-gnu + name: cli-x86_64-unknown-linux-gnu steps: - uses: actions/checkout@v2 - name: cargo build @@ -71,11 +71,11 @@ jobs: uses: AButler/upload-release-assets@v3.0 with: files: web5_cli-x86_64-unknown-linux-gnu - repo-token: ${{ secrets.TBD_RELEASE_GITHUB_PERSONAL_ACCESS_TOKEN }} + repo-token: ${{ secrets.GITHUB_TOKEN }} build_cli_x86_64_unknown_linux_musl: runs-on: ubuntu-latest - name: x86_64-unknown-linux-musl + name: cli-x86_64-unknown-linux-musl steps: - uses: actions/checkout@v2 - name: Run Build Script @@ -88,7 +88,7 @@ jobs: uses: AButler/upload-release-assets@v3.0 with: files: web5_cli-x86_64-unknown-linux-musl - repo-token: ${{ secrets.TBD_RELEASE_GITHUB_PERSONAL_ACCESS_TOKEN }} + repo-token: ${{ secrets.GITHUB_TOKEN }} git-tag: runs-on: ubuntu-latest From 206ff355d6db632bc454677adbd07978c788a9b5 Mon Sep 17 00:00:00 2001 From: Neal Date: Thu, 19 Sep 2024 13:18:03 -0700 Subject: [PATCH 2/5] reverting back to old cli generation --- .github/workflows/release.yaml | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index d572c62c..8c98661e 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -22,13 +22,11 @@ jobs: build_cli_aarch64-apple-darwin: runs-on: macos-latest - name: cli-aarch64-apple-darwin + name: aarch64-apple-darwin steps: - uses: actions/checkout@v2 - - name: Install Rust 1.74.0 - run: rustup toolchain install 1.74.0 - - name: Set Rust 1.74.0 as default - run: rustup default 1.74.0 + - name: Install Rust + run: rustup toolchain install stable - name: cargo build run: | cargo build --target aarch64-apple-darwin --release --package web5_cli @@ -41,13 +39,11 @@ jobs: build_cli_x86_64_apple_darwin: runs-on: macos-12 - name: cli-x86_64-apple-darwin + name: x86_64-apple-darwin steps: - uses: actions/checkout@v2 - - name: Install Rust 1.74.0 - run: rustup toolchain install 1.74.0 - - name: Set Rust 1.74.0 as default - run: rustup default 1.74.0 + - name: Install Rust + run: rustup toolchain install stable - name: cargo build run: | cargo build --target x86_64-apple-darwin --release --package web5_cli @@ -60,7 +56,7 @@ jobs: build_cli_x86_64_unknown_linux_gnu: runs-on: ubuntu-latest - name: cli-x86_64-unknown-linux-gnu + name: x86_64-unknown-linux-gnu steps: - uses: actions/checkout@v2 - name: cargo build @@ -75,7 +71,7 @@ jobs: build_cli_x86_64_unknown_linux_musl: runs-on: ubuntu-latest - name: cli-x86_64-unknown-linux-musl + name: x86_64-unknown-linux-musl steps: - uses: actions/checkout@v2 - name: Run Build Script From 6d67e5d231e1f628902e81ace64f5f16a8abe5ce Mon Sep 17 00:00:00 2001 From: Neal Date: Thu, 19 Sep 2024 13:52:55 -0700 Subject: [PATCH 3/5] set ex --- .github/workflows/release.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 8c98661e..4c627745 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -120,6 +120,7 @@ jobs: - id: set-version-and-tag name: Set version of Kotlin and commit run: | + set -ex # cd into the Kotlin project cd bound/kt/ From 9fc70b528c9150d6402cae9e3a1def11dd0d2546 Mon Sep 17 00:00:00 2001 From: Neal Date: Thu, 19 Sep 2024 13:56:15 -0700 Subject: [PATCH 4/5] debugging --- .github/workflows/release.yaml | 130 ++++++++++++++++----------------- 1 file changed, 65 insertions(+), 65 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 4c627745..7e801351 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -20,71 +20,71 @@ jobs: with: version: ${{ github.event.inputs.version }} - build_cli_aarch64-apple-darwin: - runs-on: macos-latest - name: aarch64-apple-darwin - steps: - - uses: actions/checkout@v2 - - name: Install Rust - run: rustup toolchain install stable - - name: cargo build - run: | - cargo build --target aarch64-apple-darwin --release --package web5_cli - cp -v target/aarch64-apple-darwin/release/web5_cli web5_cli-aarch64-apple-darwin - - name: upload release asset - uses: AButler/upload-release-assets@v3.0 - with: - files: web5_cli-aarch64-apple-darwin - repo-token: ${{ secrets.GITHUB_TOKEN }} - - build_cli_x86_64_apple_darwin: - runs-on: macos-12 - name: x86_64-apple-darwin - steps: - - uses: actions/checkout@v2 - - name: Install Rust - run: rustup toolchain install stable - - name: cargo build - run: | - cargo build --target x86_64-apple-darwin --release --package web5_cli - cp -v target/x86_64-apple-darwin/release/web5_cli web5_cli-x86_64-apple-darwin - - name: upload release asset - uses: AButler/upload-release-assets@v3.0 - with: - files: web5_cli-x86_64-apple-darwin - repo-token: ${{ secrets.GITHUB_TOKEN }} - - build_cli_x86_64_unknown_linux_gnu: - runs-on: ubuntu-latest - name: x86_64-unknown-linux-gnu - steps: - - uses: actions/checkout@v2 - - name: cargo build - run: | - cargo build --target x86_64-unknown-linux-gnu --release --package web5_cli - cp -v target/x86_64-unknown-linux-gnu/release/web5_cli web5_cli-x86_64-unknown-linux-gnu - - name: upload release asset - uses: AButler/upload-release-assets@v3.0 - with: - files: web5_cli-x86_64-unknown-linux-gnu - repo-token: ${{ secrets.GITHUB_TOKEN }} - - build_cli_x86_64_unknown_linux_musl: - runs-on: ubuntu-latest - name: x86_64-unknown-linux-musl - steps: - - uses: actions/checkout@v2 - - name: Run Build Script - run: | - pushd crates/web5_cli/build/x86_64_unknown_linux_musl - ./build - popd - cp target/x86_64-unknown-linux-musl/release/web5_cli web5_cli-x86_64-unknown-linux-musl - - name: upload release asset - uses: AButler/upload-release-assets@v3.0 - with: - files: web5_cli-x86_64-unknown-linux-musl - repo-token: ${{ secrets.GITHUB_TOKEN }} +# build_cli_aarch64-apple-darwin: +# runs-on: macos-latest +# name: aarch64-apple-darwin +# steps: +# - uses: actions/checkout@v2 +# - name: Install Rust +# run: rustup toolchain install stable +# - name: cargo build +# run: | +# cargo build --target aarch64-apple-darwin --release --package web5_cli +# cp -v target/aarch64-apple-darwin/release/web5_cli web5_cli-aarch64-apple-darwin +# - name: upload release asset +# uses: AButler/upload-release-assets@v3.0 +# with: +# files: web5_cli-aarch64-apple-darwin +# repo-token: ${{ secrets.GITHUB_TOKEN }} +# +# build_cli_x86_64_apple_darwin: +# runs-on: macos-12 +# name: x86_64-apple-darwin +# steps: +# - uses: actions/checkout@v2 +# - name: Install Rust +# run: rustup toolchain install stable +# - name: cargo build +# run: | +# cargo build --target x86_64-apple-darwin --release --package web5_cli +# cp -v target/x86_64-apple-darwin/release/web5_cli web5_cli-x86_64-apple-darwin +# - name: upload release asset +# uses: AButler/upload-release-assets@v3.0 +# with: +# files: web5_cli-x86_64-apple-darwin +# repo-token: ${{ secrets.GITHUB_TOKEN }} +# +# build_cli_x86_64_unknown_linux_gnu: +# runs-on: ubuntu-latest +# name: x86_64-unknown-linux-gnu +# steps: +# - uses: actions/checkout@v2 +# - name: cargo build +# run: | +# cargo build --target x86_64-unknown-linux-gnu --release --package web5_cli +# cp -v target/x86_64-unknown-linux-gnu/release/web5_cli web5_cli-x86_64-unknown-linux-gnu +# - name: upload release asset +# uses: AButler/upload-release-assets@v3.0 +# with: +# files: web5_cli-x86_64-unknown-linux-gnu +# repo-token: ${{ secrets.GITHUB_TOKEN }} +# +# build_cli_x86_64_unknown_linux_musl: +# runs-on: ubuntu-latest +# name: x86_64-unknown-linux-musl +# steps: +# - uses: actions/checkout@v2 +# - name: Run Build Script +# run: | +# pushd crates/web5_cli/build/x86_64_unknown_linux_musl +# ./build +# popd +# cp target/x86_64-unknown-linux-musl/release/web5_cli web5_cli-x86_64-unknown-linux-musl +# - name: upload release asset +# uses: AButler/upload-release-assets@v3.0 +# with: +# files: web5_cli-x86_64-unknown-linux-musl +# repo-token: ${{ secrets.GITHUB_TOKEN }} git-tag: runs-on: ubuntu-latest From ed042d3f1d4a7a4d4beec092bbf0348c536d2016 Mon Sep 17 00:00:00 2001 From: Neal Date: Thu, 19 Sep 2024 14:09:22 -0700 Subject: [PATCH 5/5] debug2 --- .github/workflows/release.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 7e801351..38a4f86f 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -165,6 +165,12 @@ jobs: versions:set \ --batch-mode \ -DnewVersion=$nextVersion + + # START TESTING + git branch -r + git status + # END TESTING + git add -Av git commit -m "[TBD Release Manager 🚀] Setting next development version after $version to: $nextVersion" git push origin main