Skip to content

Commit 794516c

Browse files
committed
Use stage 2 builds for comparision
1 parent a2a3335 commit 794516c

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

.github/workflows/repro_check.yml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on:
44
push:
55
branches:
66
- master
7-
- reproducible
87
pull_request:
98
branches:
109
- master
@@ -40,11 +39,11 @@ jobs:
4039
cd ../buildA
4140
SOURCE_DIR=$(dirname $(find . -maxdepth 2 -name x.py))
4241
$SOURCE_DIR/configure --set rust.channel=nightly
43-
$SOURCE_DIR/x.py build --stage 1 -j$(($(nproc)*2/3))
42+
$SOURCE_DIR/x.py build --stage 2 -j$(($(nproc)*2/3))
4443
rm -rf $SOURCE_DIR
45-
STAGE1_DIR=`find build -name stage1`
44+
STAGE1_DIR=`find build -name stage2`
4645
cp -r "$STAGE1_DIR" .
47-
echo "Contents stage 1 dir : `ls stage1`"
46+
echo "Contents stage 2 dir : `ls stage2`"
4847
rm -rf build
4948
5049
- name: Build and store binaries from source 2
@@ -53,13 +52,12 @@ jobs:
5352
echo "Repo storage available: `df -h .`"
5453
SOURCE_DIR=$(dirname $(find . -maxdepth 2 -name x.py))
5554
$SOURCE_DIR/configure --set rust.channel=nightly
56-
$SOURCE_DIR/x.py build --stage 1 -j$(($(nproc)*2/3))
55+
$SOURCE_DIR/x.py build --stage 2 -j$(($(nproc)*2/3))
5756
rm -rf $SOURCE_DIR
58-
STAGE1_DIR=`find build -name stage1`
57+
STAGE1_DIR=`find build -name stage2`
5958
cp -r "$STAGE1_DIR" .
60-
echo "Contents stage 1 dir : `ls stage1`"
59+
echo "Contents stage 2 dir : `ls stage2`"
6160
rm -rf build
62-
cd ..
6361
6462
- name: Install diffoscope
6563
run: |
@@ -78,7 +76,7 @@ jobs:
7876
fi
7977
8078
# Perform a diff between the two builds
81-
diffoscope buildA/stage1 buildA_extended/stage1 > diffoscope_output.txt || echo "Differences found!"
79+
diffoscope buildA/stage2 buildA_extended/stage2 > diffoscope_output.txt || echo "Differences found!"
8280
8381
- name: Upload diffoscope output
8482
uses: actions/upload-artifact@v4

0 commit comments

Comments
 (0)