CI: respect 32/64bit and cleanup

.github/workflows/build-linux.yml

@@ -42,15 +42,21 @@ jobs:
         run: cargo test --lib -- --test-threads 1
         env:
           RUSTFLAGS: ""
-      - name: Check C
+      - name: Check C (x86_64)
+        if: ${{ matrix.target == 'x86_64-unknown-linux-gnu' }}
         run: |
-          python ./scripts/build-and-judge.py ${{ runner.temp }} ./release.sh C ./src/solution.rs ./tests/boj_1000.in ./tests/boj_1000.out
-      - name: Check Rust
+          python ./scripts/build-and-judge.py ${{ runner.temp }} ./release.sh C 64 ./src/solution.rs ./tests/boj_1000.in ./tests/boj_1000.out
+          python ./scripts/build-and-judge.py ${{ runner.temp }} ./release.sh C 64 ./tests/boj_1001.rs ./tests/boj_1001.in ./tests/boj_1001.out
+          python ./scripts/build-and-judge.py ${{ runner.temp }} ./release.sh C 64 ./tests/boj_3745.rs ./tests/boj_3745.in ./tests/boj_3745.out
+      - name: Check C (x86)
+        if: ${{ matrix.target == 'i686-unknown-linux-gnu' }}
         run: |
-          python ./scripts/build-and-judge.py ${{ runner.temp }} ./release-rs.sh Rust ./src/solution.rs ./tests/boj_1000.in ./tests/boj_1000.out
-      - name: Check Rust (BOJ 1001)
+          python ./scripts/build-and-judge.py ${{ runner.temp }} ./release-32bit.sh C 32 ./src/solution.rs ./tests/boj_1000.in ./tests/boj_1000.out
+          python ./scripts/build-and-judge.py ${{ runner.temp }} ./release-32bit.sh C 32 ./tests/boj_1001.rs ./tests/boj_1001.in ./tests/boj_1001.out
+          python ./scripts/build-and-judge.py ${{ runner.temp }} ./release-32bit.sh C 32 ./tests/boj_3745.rs ./tests/boj_3745.in ./tests/boj_3745.out
+      - name: Check Rust (x86_64)
+        if: ${{ matrix.target == 'x86_64-unknown-linux-gnu' }}
         run: |
-          python ./scripts/build-and-judge.py ${{ runner.temp }} ./release-rs.sh Rust ./tests/boj_1001.rs ./tests/boj_1001.in ./tests/boj_1001.out
-      - name: Check Rust (BOJ 3745)
-        run: |
-          python ./scripts/build-and-judge.py ${{ runner.temp }} ./release-rs.sh Rust ./tests/boj_3745.rs ./tests/boj_3745.in ./tests/boj_3745.out
+          python ./scripts/build-and-judge.py ${{ runner.temp }} ./release-rs.sh Rust 64 ./src/solution.rs ./tests/boj_1000.in ./tests/boj_1000.out
+          python ./scripts/build-and-judge.py ${{ runner.temp }} ./release-rs.sh Rust 64 ./tests/boj_1001.rs ./tests/boj_1001.in ./tests/boj_1001.out
+          python ./scripts/build-and-judge.py ${{ runner.temp }} ./release-rs.sh Rust 64 ./tests/boj_3745.rs ./tests/boj_3745.in ./tests/boj_3745.out

.github/workflows/build-windows.yml

@@ -44,15 +44,13 @@ jobs:
         run: cargo test --lib -- --test-threads 1
         env:
           RUSTFLAGS: ""
-      - name: Check C
+      - name: Check C (x86_64)
         run: |
-          python .\scripts\build-and-judge.py ${{ runner.temp }} .\release-64bit-windows.cmd C .\src\solution.rs .\tests\boj_1000.in .\tests\boj_1000.out
-      - name: Check Rust
+          python .\scripts\build-and-judge.py ${{ runner.temp }} .\release-64bit-windows.cmd C 64 .\src\solution.rs .\tests\boj_1000.in .\tests\boj_1000.out
+          python .\scripts\build-and-judge.py ${{ runner.temp }} .\release-64bit-windows.cmd C 64 .\tests\boj_1001.rs .\tests\boj_1001.in .\tests\boj_1001.out
+          python .\scripts\build-and-judge.py ${{ runner.temp }} .\release-64bit-windows.cmd C 64 .\tests\boj_3745.rs .\tests\boj_3745.in .\tests\boj_3745.out
+      - name: Check Rust (x86_64)
         run: |
-          python .\scripts\build-and-judge.py ${{ runner.temp }} .\release-64bit-windows-rs.cmd Rust .\src\solution.rs .\tests\boj_1000.in .\tests\boj_1000.out
-      - name: Check Rust (BOJ 1001)
-        run: |
-          python .\scripts\build-and-judge.py ${{ runner.temp }} .\release-64bit-windows-rs.cmd Rust .\tests\boj_1001.rs .\tests\boj_1001.in .\tests\boj_1001.out
-      - name: Check Rust (BOJ 3745)
-        run: |
-          python .\scripts\build-and-judge.py ${{ runner.temp }} .\release-64bit-windows-rs.cmd Rust .\tests\boj_3745.rs .\tests\boj_3745.in .\tests\boj_3745.out
+          python .\scripts\build-and-judge.py ${{ runner.temp }} .\release-64bit-windows-rs.cmd Rust 64 .\src\solution.rs .\tests\boj_1000.in .\tests\boj_1000.out
+          python .\scripts\build-and-judge.py ${{ runner.temp }} .\release-64bit-windows-rs.cmd Rust 64 .\tests\boj_1001.rs .\tests\boj_1001.in .\tests\boj_1001.out
+          python .\scripts\build-and-judge.py ${{ runner.temp }} .\release-64bit-windows-rs.cmd Rust 64 .\tests\boj_3745.rs .\tests\boj_3745.in .\tests\boj_3745.out

scripts/build-and-judge.py

@@ -30,9 +30,10 @@ def test_equal(x, y):
     tmp_dir = sys.argv[1]
     build_cmd = sys.argv[2]
     language = sys.argv[3]
-    sol_path = sys.argv[4]
-    indata_path = sys.argv[5]
-    outdata_path = sys.argv[6]
+    bits = int(sys.argv[4])
+    sol_path = sys.argv[5]
+    indata_path = sys.argv[6]
+    outdata_path = sys.argv[7]
     src_ext = {"C": "c", "Rust": "rs"}[language]
 
     # Prepare environment
@@ -72,7 +73,7 @@ def test_equal(x, y):
         if platform.system() == "Windows":
             os.system("cl {0} /F268435456 /Fe{1} /link /SUBSYSTEM:CONSOLE".format(src_path, bin_path))
         else:
-            os.system("gcc -o {1} -O3 {0}".format(src_path, bin_path))
+            os.system("gcc -o {1} {2} {0}".format(src_path, bin_path, "-O3 -m32" if bits == 32 else "-O3"))
     else: # language == "Rust"
         if platform.system() == "Windows":
             os.system("rustc -C opt-level=3 -o {1} --crate-type=bin {0}".format(src_path, bin_path))

scripts/static-pie-gen.py

@@ -81,9 +81,9 @@
     stub = f.read()
 
 stub = bytearray(stub)
-stub_raw = '"' + "".join("\\x{:02x}".format(x) for x in stub) + '"'
 while len(stub) % 4 != 0:
     stub.append(0)
+stub_raw = '"' + "".join("\\x{:02x}".format(x) for x in stub) + '"'
 stub_b85 = base64.b85encode(stub, pad=False).decode('ascii') + ']'
 stub_b85_len = len(stub_b85)
 if lang_name == "C":