Skip to content

Commit f55187f

Browse files
committed
review
1 parent eb8f96d commit f55187f

File tree

3 files changed

+9
-14
lines changed

3 files changed

+9
-14
lines changed

.github/actions/setup/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ runs:
5050
if: ${{ contains(inputs.toolchain, 'build') }}
5151
uses: dtolnay/rust-toolchain@master
5252
with:
53-
toolchain: ${{ env.RUST_TOOLCHAIN_NIGHTLY }}
53+
toolchain: stable
5454

5555
- name: Install Rust 'format' Toolchain
5656
if: ${{ contains(inputs.toolchain, 'format') }}
@@ -70,7 +70,7 @@ runs:
7070
if: ${{ contains(inputs.toolchain, 'test') }}
7171
uses: dtolnay/rust-toolchain@master
7272
with:
73-
toolchain: ${{ env.RUST_TOOLCHAIN_NIGHTLY }}
73+
toolchain: stable
7474

7575
- name: Install Solana
7676
if: ${{ inputs.solana == 'true' }}

.github/workflows/main.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ jobs:
108108
with:
109109
toolchain: test
110110
cargo-cache-key: cargo-interface
111-
solana: true
112111

113112
- name: Test Interface
114113
run: make test-interface

scripts/publish-rust.sh

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,21 @@ fi
1414

1515
cd "$library_path"
1616

17+
# Extract crate name using cargo metadata
18+
metadata=$(cargo metadata --no-deps --format-version 1)
19+
crate_name=$(echo "$metadata" | jq -r '.packages[0].name')
20+
1721
# Run cargo-release
1822
if [[ "$dry_run" != "true" ]]; then
19-
cargo release "$level" --no-push --no-tag --no-confirm --execute
23+
cargo release "$level" --tag-name "${crate_name}@v{{version}}" --no-confirm --execute --dependent-version fix
2024
else
2125
cargo release "$level"
2226
exit 0
2327
fi
2428

25-
# Extract crate name and version using cargo metadata
26-
metadata=$(cargo metadata --no-deps --format-version 1)
27-
crate_name=$(echo "$metadata" | jq -r '.packages[0].name')
28-
new_version=$(echo "$metadata" | jq -r '.packages[0].version')
29-
3029
# CI output
3130
if [[ -n "${CI:-}" ]]; then
31+
metadata=$(cargo metadata --no-deps --format-version 1)
32+
new_version=$(echo "$metadata" | jq -r '.packages[0].version')
3233
echo "new_version=${new_version}" >> "$GITHUB_OUTPUT"
3334
fi
34-
35-
# Rebuild commit and tag
36-
git reset --soft HEAD~1
37-
git commit -am "Publish ${crate_name} v${new_version}"
38-
git tag -a "${crate_name}@v${new_version}" -m "${crate_name} v${new_version}"

0 commit comments

Comments
 (0)