Skip to content

Commit 2899175

Browse files
committed
move utils from rust/scripts --> rust/scripts/ci
1 parent 66e8695 commit 2899175

File tree

6 files changed

+16
-16
lines changed

6 files changed

+16
-16
lines changed

.github/workflows/rust-release.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
- pb/rust-release-cargo # for testing
88
paths:
99
- 'rust/main/**'
10-
- 'rust/scripts/generate-workspace-changelog.sh'
10+
- 'rust/scripts/ci/**'
1111
- '.github/workflows/rust-release.yml'
1212
workflow_dispatch:
1313
inputs:
@@ -47,7 +47,7 @@ jobs:
4747
working-directory: ./rust/main
4848
run: |
4949
# Get latest agents-v* tag
50-
LATEST_TAG=$(../scripts/get-latest-agents-tag.sh)
50+
LATEST_TAG=$(../scripts/ci/get-latest-agents-tag.sh)
5151
5252
if [ -z "$LATEST_TAG" ]; then
5353
echo "No previous release found"
@@ -70,12 +70,12 @@ jobs:
7070
working-directory: ./rust/main
7171
run: |
7272
# Get current version from Cargo.toml workspace.package.version
73-
CURRENT_VERSION=$(../scripts/get-workspace-version.sh)
73+
CURRENT_VERSION=$(../scripts/ci/get-workspace-version.sh)
7474
echo "current_version=$CURRENT_VERSION" >> $GITHUB_OUTPUT
7575
echo "Current workspace version: $CURRENT_VERSION"
7676
7777
# Get latest agents-v* tag
78-
LATEST_TAG=$(../scripts/get-latest-agents-tag.sh)
78+
LATEST_TAG=$(../scripts/ci/get-latest-agents-tag.sh)
7979
8080
if [ -z "$LATEST_TAG" ]; then
8181
echo "latest_version=" >> $GITHUB_OUTPUT
@@ -113,7 +113,7 @@ jobs:
113113
CURRENT_VERSION: ${{ needs.check-release-status.outputs.current_version }}
114114
run: |
115115
# Use helper script to determine next version
116-
OUTPUT=$(./rust/scripts/determine-next-version.sh "$CURRENT_VERSION")
116+
OUTPUT=$(./rust/scripts/ci/determine-next-version.sh "$CURRENT_VERSION")
117117
NEW_VERSION=$(echo "$OUTPUT" | sed -n '1p')
118118
BUMP_TYPE=$(echo "$OUTPUT" | sed -n '2p')
119119
@@ -126,7 +126,7 @@ jobs:
126126
NEW_VERSION: ${{ steps.next_version.outputs.new_version }}
127127
run: |
128128
# Get commit range for changelog generation
129-
LATEST_TAG=$(./rust/scripts/get-latest-agents-tag.sh)
129+
LATEST_TAG=$(./rust/scripts/ci/get-latest-agents-tag.sh)
130130
131131
if [ -z "$LATEST_TAG" ]; then
132132
COMMIT_RANGE=""
@@ -136,9 +136,9 @@ jobs:
136136
137137
# Generate unified changelog for PR body
138138
if [ -z "$COMMIT_RANGE" ]; then
139-
CHANGELOG=$(./rust/scripts/generate-workspace-changelog.sh --no-header)
139+
CHANGELOG=$(./rust/scripts/ci/generate-workspace-changelog.sh --no-header)
140140
else
141-
CHANGELOG=$(./rust/scripts/generate-workspace-changelog.sh "$COMMIT_RANGE" --no-header)
141+
CHANGELOG=$(./rust/scripts/ci/generate-workspace-changelog.sh "$COMMIT_RANGE" --no-header)
142142
fi
143143
144144
# Save changelog to file for PR body
@@ -152,13 +152,13 @@ jobs:
152152
} >> $GITHUB_OUTPUT
153153
154154
# Generate per-workspace CHANGELOG.md files
155-
./rust/scripts/generate-workspace-changelog.sh "$COMMIT_RANGE" "" --write-to-workspace "$NEW_VERSION"
155+
./rust/scripts/ci/generate-workspace-changelog.sh "$COMMIT_RANGE" "" --write-to-workspace "$NEW_VERSION"
156156
- name: Update version files
157157
env:
158158
NEW_VERSION: ${{ steps.next_version.outputs.new_version }}
159159
run: |
160160
# Update workspace version in Cargo.toml
161-
./rust/scripts/update-workspace-version.sh "$NEW_VERSION"
161+
./rust/scripts/ci/update-workspace-version.sh "$NEW_VERSION"
162162
163163
# Update Cargo.lock in rust/main
164164
cd rust/main
@@ -311,9 +311,9 @@ jobs:
311311
fi
312312
313313
if [ -z "$PREV_TAG" ]; then
314-
CHANGELOG=$(./rust/scripts/generate-workspace-changelog.sh)
314+
CHANGELOG=$(./rust/scripts/ci/generate-workspace-changelog.sh)
315315
else
316-
CHANGELOG=$(./rust/scripts/generate-workspace-changelog.sh "${PREV_TAG}..${COMMIT_RANGE_END}")
316+
CHANGELOG=$(./rust/scripts/ci/generate-workspace-changelog.sh "${PREV_TAG}..${COMMIT_RANGE_END}")
317317
fi
318318
319319
# Generate new contributors section using GitHub's auto-generated notes

rust/scripts/determine-next-version.sh renamed to rust/scripts/ci/determine-next-version.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ COMMIT_RANGE="${2:-}"
3030

3131
# Determine script directory
3232
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
33-
RUST_MAIN_DIR="$SCRIPT_DIR/../main"
33+
RUST_MAIN_DIR="$SCRIPT_DIR/../../main"
3434

3535
# If no commit range specified, use commits since latest tag
3636
if [ -z "$COMMIT_RANGE" ]; then

rust/scripts/generate-workspace-changelog.sh renamed to rust/scripts/ci/generate-workspace-changelog.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ set -euo pipefail
2525

2626
# Determine script directory and repo structure
2727
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
28-
RUST_MAIN_DIR="$SCRIPT_DIR/../main"
28+
RUST_MAIN_DIR="$SCRIPT_DIR/../../main"
2929

3030
# Parse arguments
3131
COMMIT_RANGE=""
File renamed without changes.

rust/scripts/get-workspace-version.sh renamed to rust/scripts/ci/get-workspace-version.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ set -euo pipefail
1111

1212
# Determine script directory and repo structure
1313
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
14-
RUST_MAIN_DIR="$SCRIPT_DIR/../main"
14+
RUST_MAIN_DIR="$SCRIPT_DIR/../../main"
1515

1616
grep -A 10 '^\[workspace\.package\]' "$RUST_MAIN_DIR/Cargo.toml" | \
1717
grep '^version = ' | \

rust/scripts/update-workspace-version.sh renamed to rust/scripts/ci/update-workspace-version.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ NEW_VERSION="$1"
2222

2323
# Determine script directory and repo structure
2424
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
25-
RUST_MAIN_DIR="$SCRIPT_DIR/../main"
25+
RUST_MAIN_DIR="$SCRIPT_DIR/../../main"
2626
CARGO_TOML="$RUST_MAIN_DIR/Cargo.toml"
2727

2828
# Use awk to find [workspace.package] section and update version within it

0 commit comments

Comments
 (0)