build mar for x84 build

goastian · Oct 13, 2023 · 0e33589 · 0e33589
1 parent 0bf4e69
commit 0e33589
Showing 1 changed file with 15 additions and 7 deletions.
diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml
@@ -328,17 +328,25 @@ jobs:
       id: gen-mar
       if : inputs.mar
       run: |
-        # mkdir -p output
-        touch "obj-x86_64-pc-windows-msvc/dist/midori/precomplete"
-        MAR="obj-x86_64-pc-windows-msvc/dist/host/bin/mar" \
+        if [[ $GHA_aarch64 == 'true' ]];then
+          arch="aarch64"
+        elif [[ $GHA_32bit == 'true' ]];then
+          arch="i686"
+        else
+          arch="x86_64"
+        fi
+        touch "obj-${arch}-pc-windows-msvc/dist/midori/precomplete"
+        MAR="obj-${arch}-pc-windows-msvc/dist/host/bin/mar" \
         MOZ_PRODUCT_VERSION=$(cat browser/config/version_display.txt) \
         MAR_CHANNEL_ID=release \
-        ./tools/update-packaging/make_full_update.sh ~/output "obj-x86_64-pc-windows-msvc/dist/midori"
+        ./tools/update-packaging/make_full_update.sh ~/output "obj-${arch}-pc-windows-msvc/dist/midori"
 
-        mv ~/output/*.mar ~/output/WINNT-x86_64.mar
+        mv ~/output/*.mar ~/output/WINNT-${arch}.mar
 
-        echo "MAR_NAME=WINNT-x86_64.mar" >> $GITHUB_OUTPUT
-        echo "MAR_SIZE=$(stat -c "%s" ~/output/WINNT-x86_64.mar)" >> $GITHUB_OUTPUT
+        echo "MAR_NAME=WINNT-${arch}.mar" >> $GITHUB_OUTPUT
+        echo "MAR_SIZE=$(stat -c "%s" ~/output/WINNT-${arch}.mar)" >> $GITHUB_OUTPUT
+      env:
+        GHA_32bit: ${{inputs.build32bit}}
 
     # Publish START
     - name: make name of publish archive