Skip to content

Commit fbe2077

Browse files
committed
fix: use precise version in fork script
1 parent 8d86297 commit fbe2077

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
- name: Run fork.sh scripts and verify no diffs
5757
run: |
5858
cd testing
59-
./fork.sh 1.25
59+
./fork.sh 1.25.4
6060
cd ..
6161
6262
if ! git diff --exit-code testing/ > /dev/null 2>&1; then

testing/fork.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,12 @@ backup_files "${CODSPEED_FILES[@]}"
9494

9595
# We need to copy the testing/ package:
9696
rm -rf go testing internal
97-
git clone -b "release-branch.go${GO_VERSION}" --depth 1 https://github.com/golang/go/
97+
git clone -b "go${GO_VERSION}" --depth 1 https://github.com/golang/go/
9898
cp -r go/src/testing testing/
9999

100100
# Copy all required internal packages. We need them to have a clean `go mod tidy` output.
101101
copy_internal_packages "cpu" "fuzz" "goarch" "race" "sysinfo" "testlog" "testenv" "syscall/windows" "godebug" "synctest" "bisect" "godebugs" "cfg" "platform" "diff" "txtar"
102+
rm -rf go
102103

103104
# Replace all `"internal/*"` imports with 'github.com/CodSpeedHQ/codspeed-go/testing/internal/'
104105
find . -type f -name "*.go" -exec sed -i 's|"internal/|"github.com/CodSpeedHQ/codspeed-go/testing/internal/|g' {} +
@@ -122,6 +123,7 @@ restore_files "${CODSPEED_FILES[@]}"
122123

123124
apply_patch "patches/benchmark_stopbenchmark_fail.patch" 10 ".."
124125

126+
125127
# Run pre-commit and format the code
126128
go fmt ./... > /dev/null 2>&1 || true
127129
pre-commit run --all-files > /dev/null 2>&1 || true

0 commit comments

Comments
 (0)