@@ -112,6 +112,8 @@ jobs:
112112 -e "s|{{__ARCH__}}|riscv64|g" \
113113 installers/nix-setup-template.sh > "$ARCHIVE_BASE/setup.sh"
114114
115+ chmod +x "$ARCHIVE_BASE/setup.sh"
116+
115117 mv build_output.txt "$ARCHIVE_BASE/build_output.txt"
116118
117119 (cd "$ARCHIVE_BASE" && find . \( -type f -o -type l \) | sed 's|^\./|/|') > "$ARCHIVE_BASE/tools_structure.txt"
@@ -123,35 +125,36 @@ jobs:
123125 if : ${{ inputs.freethreaded == true }}
124126 env :
125127 MINOR : ${{ steps.vars.outputs.minor }}
126- ARCHIVE_BASE : ${{ steps.vars.outputs.archive_base }}
128+ ARCHIVE_BASE : ${{ format('{0}-freethreaded', steps.vars.outputs.archive_base) }}
127129 NORMALISED : ${{ steps.vars.outputs.normalised }}
128130 run : |
129- ft_base="${ARCHIVE_BASE}-freethreaded"
130131 pushd src
131132 git clean -fdx
132133 ./configure --with-ensurepip=install --enable-shared --disable-gil
133134 make -j"$(nproc)" 2>&1 | tee ../build_output.txt
134135 make install DESTDIR="$PWD/../staging-ft"
135136 popd
136137
137- mkdir -p "$ft_base "
138- cp -a staging-ft/usr/local/bin "$ft_base /"
139- cp -a staging-ft/usr/local/include "$ft_base /"
140- cp -a staging-ft/usr/local/lib "$ft_base /"
141- cp -a staging-ft/usr/local/share "$ft_base /"
138+ mkdir -p "$ARCHIVE_BASE "
139+ cp -a staging-ft/usr/local/bin "$ARCHIVE_BASE /"
140+ cp -a staging-ft/usr/local/include "$ARCHIVE_BASE /"
141+ cp -a staging-ft/usr/local/lib "$ARCHIVE_BASE /"
142+ cp -a staging-ft/usr/local/share "$ARCHIVE_BASE /"
142143
143- patchelf --set-rpath '$ORIGIN/../lib' "$ft_base /bin/python${MINOR}"
144+ patchelf --set-rpath '$ORIGIN/../lib' "$ARCHIVE_BASE /bin/python${MINOR}"
144145
145146 sed -e "s|{{__VERSION_FULL__}}|${NORMALISED}|g" \
146147 -e "s|{{__ARCH__}}|riscv64|g" \
147- installers/nix-setup-template.sh > "$ft_base /setup.sh"
148+ installers/nix-setup-template.sh > "$ARCHIVE_BASE /setup.sh"
148149
149- mv build_output.txt "$ft_base/build_output.txt "
150+ chmod +x "$ARCHIVE_BASE/setup.sh "
150151
151- (cd "$ft_base" && find . \( -type f -o -type l \) | sed 's|^\./|/|') > "$ft_base/tools_structure.txt"
152+ mv build_output.txt "$ARCHIVE_BASE/build_output.txt"
153+
154+ (cd "$ARCHIVE_BASE" && find . \( -type f -o -type l \) | sed 's|^\./|/|') > "$ARCHIVE_BASE/tools_structure.txt"
152155
153- tar -czf "output/${ft_base }.tar.gz" "$ft_base "
154- rm -rf "$ft_base " staging-ft
156+ tar -czf "output/${ARCHIVE_BASE }.tar.gz" "$ARCHIVE_BASE "
157+ rm -rf "$ARCHIVE_BASE " staging-ft
155158
156159 - name : Print tarball hashes
157160 run : sha256sum output/*.tar.gz
0 commit comments