Skip to content

Commit f8a7e23

Browse files
authored
fix: failing aarch-release-ci (#119)
1 parent 90e8d71 commit f8a7e23

File tree

1 file changed

+38
-36
lines changed

1 file changed

+38
-36
lines changed

.github/workflows/release.yml

Lines changed: 38 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -51,39 +51,39 @@ jobs:
5151
with:
5252
fetch-depth: 0 # Need full history to verify tag is from "main" branch
5353

54-
# - name: Verify tag is from main branch
55-
# shell: bash
56-
# run: |
57-
# # Get the commit SHA that the tag points to
58-
# TAG_COMMIT=$(git rev-list -n 1 ${{ github.ref }})
59-
#
60-
# # Check if this commit exists on main branch
61-
# git fetch origin main
62-
# if ! git merge-base --is-ancestor $TAG_COMMIT origin/main; then
63-
# echo "Error: Tag must be created from main branch!"
64-
# echo "This tag points to commit $TAG_COMMIT which is not on main branch."
65-
# exit 1
66-
# fi
67-
# echo "Tag is from main branch (commit: $TAG_COMMIT)"
68-
#
69-
# # Make sure that Cargo.toml version for each tool is the same as the tag
70-
# - name: Verify version consistency
71-
# shell: bash
72-
# run: |
73-
# # Extract version from tag
74-
# TAG_VERSION="${GITHUB_REF#refs/tags/v}"
75-
#
76-
# # Check each tool's Cargo.toml version
77-
# for tool in move-mutation-test move-mutator move-spec-test; do
78-
# CARGO_VERSION=$(grep "^version" $tool/Cargo.toml | head -1 | cut -d'"' -f2)
79-
# if [ "$CARGO_VERSION" != "$TAG_VERSION" ]; then
80-
# echo "Error: Version mismatch for $tool!"
81-
# echo " Tag version: $TAG_VERSION"
82-
# echo " Cargo.toml version: $CARGO_VERSION"
83-
# exit 1
84-
# fi
85-
# echo "$tool version matches: $CARGO_VERSION"
86-
# done
54+
- name: Verify tag is from main branch
55+
shell: bash
56+
run: |
57+
# Get the commit SHA that the tag points to
58+
TAG_COMMIT=$(git rev-list -n 1 ${{ github.ref }})
59+
60+
# Check if this commit exists on main branch
61+
git fetch origin main
62+
if ! git merge-base --is-ancestor $TAG_COMMIT origin/main; then
63+
echo "Error: Tag must be created from main branch!"
64+
echo "This tag points to commit $TAG_COMMIT which is not on main branch."
65+
exit 1
66+
fi
67+
echo "Tag is from main branch (commit: $TAG_COMMIT)"
68+
69+
# Make sure that Cargo.toml version for each tool is the same as the tag
70+
- name: Verify version consistency
71+
shell: bash
72+
run: |
73+
# Extract version from tag
74+
TAG_VERSION="${GITHUB_REF#refs/tags/v}"
75+
76+
# Check each tool's Cargo.toml version
77+
for tool in move-mutation-test move-mutator move-spec-test; do
78+
CARGO_VERSION=$(grep "^version" $tool/Cargo.toml | head -1 | cut -d'"' -f2)
79+
if [ "$CARGO_VERSION" != "$TAG_VERSION" ]; then
80+
echo "Error: Version mismatch for $tool!"
81+
echo " Tag version: $TAG_VERSION"
82+
echo " Cargo.toml version: $CARGO_VERSION"
83+
exit 1
84+
fi
85+
echo "$tool version matches: $CARGO_VERSION"
86+
done
8787
8888
- name: Enable long paths on Windows
8989
if: runner.os == 'Windows'
@@ -94,7 +94,9 @@ jobs:
9494

9595
- name: Install required deps
9696
if: runner.os == 'Linux'
97-
run: sudo apt-get install libssl-dev pkg-config libudev-dev libdw-dev
97+
run: |
98+
sudo apt-get update
99+
sudo apt-get install libssl-dev pkg-config libudev-dev libdw-dev
98100
99101
- name: Install Rust toolchain
100102
uses: dtolnay/rust-toolchain@stable
@@ -163,8 +165,8 @@ jobs:
163165
fi
164166
165167
if [ "${{ runner.os }}" = "Windows" ]; then
166-
# HACK: Normalize Windows path. This only works because we test a single Move project
167-
sed -i 's/"sources\\\\Operators.move"/"sources\/Operators.move"/g' report-mutation-generated.txt
168+
# HACK: Normalize Windows paths to Unix-style paths so that the diff passes
169+
sed -i 's/sources\\\\/sources\//g' report-mutation-generated.txt
168170
fi
169171
170172
# Remove trailing newlines from both files

0 commit comments

Comments
 (0)