build, refactor: change amd64/i386 to x64/x86.

Author: xicilion

.github/workflows/build.yml

@@ -34,10 +34,10 @@ jobs:
       matrix:
         include:
           - os: ubuntu-20.04
-            target_arch: amd64
+            target_arch: x64
             build_type: release
           - os: ubuntu-20.04
-            target_arch: i386
+            target_arch: x86
             build_type: release
           - os: ubuntu-20.04
             target_arch: arm64
@@ -59,24 +59,24 @@ jobs:
             build_type: release
           - os: ubuntu-20.04
             build_target: alpine
-            target_arch: amd64
+            target_arch: x64
             build_type: release
           - os: ubuntu-20.04
             build_target: alpine
-            target_arch: i386
+            target_arch: x86
             build_type: release
           - os: ubuntu-20.04
             build_target: alpine
             target_arch: arm64
             build_type: release
           - os: ubuntu-20.04
             build_target: android
-            target_arch: amd64
+            target_arch: x64
             build_type: release
             skip_test: skip
           - os: ubuntu-20.04
             build_target: android
-            target_arch: i386
+            target_arch: x86
             build_type: release
             skip_test: skip
           - os: ubuntu-20.04
@@ -90,24 +90,24 @@ jobs:
             build_type: release
             skip_test: skip
           - os: windows-2022
-            target_arch: amd64
+            target_arch: x64
             build_type: release
           - os: windows-2022
-            target_arch: i386
+            target_arch: x86
             build_type: release
           - os: windows-2022
             target_arch: arm64
             build_type: release
             skip_test: skip
           - os: macos-11
-            target_arch: amd64
+            target_arch: x64
             build_type: release
           - os: macos-11
             target_arch: arm64
             build_type: release
             skip_test: skip
           - os: macos-11
-            target_arch: amd64
+            target_arch: x64
             build_type: debug
           - os: macos-11
             build_target: iphone
@@ -116,7 +116,7 @@ jobs:
             skip_test: skip
           - os: macos-11
             build_target: iphone
-            target_arch: amd64
+            target_arch: x64
             build_type: release
             skip_test: skip
 
@@ -189,8 +189,8 @@ jobs:
         if: runner.os == 'Windows'
         shell: cmd
         run: |
-          IF /I "%DIST_ARCH%" == "x64" ECHO "x64 building..." && .\build.cmd release amd64
-          IF /I "%DIST_ARCH%" == "x86" ECHO "x86 building..." && .\build.cmd release i386
+          IF /I "%DIST_ARCH%" == "x64" ECHO "x64 building..." && .\build.cmd release x64
+          IF /I "%DIST_ARCH%" == "x86" ECHO "x86 building..." && .\build.cmd release x86
           IF /I "%DIST_ARCH%" == "arm64" ECHO "arm64 building..." && .\build.cmd release arm64
         env:
           TARGET_ARCH: ${{ matrix.target_arch }}

.github/workflows/set-env-vars.sh

@@ -54,20 +54,8 @@ else
 fi
 echo "RELEASE_TAG_FROM_GIT_ORIGIN=$RELEASE_TAG_FROM_GIT_ORIGIN" >> $GITHUB_OUTPUT
 
-case "${TARGET_ARCH}" in
-    i386)
-        DIST_ARCH=x86
-        SNAPSHOT_ARCH=ia32
-        ;;
-    amd64)
-        DIST_ARCH=x64
-        SNAPSHOT_ARCH=x64
-        ;;
-    *)
-        DIST_ARCH=$TARGET_ARCH
-        SNAPSHOT_ARCH=$TARGET_ARCH
-        ;;
-esac
+DIST_ARCH=$TARGET_ARCH
+SNAPSHOT_ARCH=$TARGET_ARCH
 
 if [[ "$RUNNER_OS" == "Linux" ]]; then
     export TARGET_OS_NAME="Linux";

.github/workflows/test.sh

@@ -8,7 +8,7 @@ if [[ $TARGET_OS_NAME == 'Linux' ]]; then
     if [[ "$BUILD_TARGET" != "" ]]; then
         docker run -t --rm -e CI=${CI} -v ${CUR}:/fibjs fibjs/${BUILD_TARGET}-test-env:${TARGET_ARCH} bash -c "cd /fibjs; ./bin/${DIST_DIR}/fibjs test/main.js"
     else
-        if [[ $TARGET_ARCH == 'amd64' ]]; then
+        if [[ $TARGET_ARCH == 'x64' ]]; then
             docker run -t --rm -e CI=${CI} -v ${CUR}:/fibjs ubuntu:12.04 bash -c "cd /fibjs; ./bin/${DIST_DIR}/fibjs test/main.js"
         else
             docker run -t --rm -e CI=${CI} -v ${CUR}:/fibjs fibjs/linux-build-env:${TARGET_ARCH} bash -c "cd /fibjs; ./bin/${DIST_DIR}/fibjs test/main.js"

dockerfiles/alpine-build-env.amd64 renamed to dockerfiles/alpine-build-env.x64

@@ -1,21 +1,21 @@
-docker build --rm -f linux-build-env.amd64 -t fibjs/linux-build-env:amd64 .
-docker build --rm -f linux-build-env.i386 -t fibjs/linux-build-env:i386 .
+docker build --rm -f linux-build-env.x64 -t fibjs/linux-build-env:x64 .
+docker build --rm -f linux-build-env.x86 -t fibjs/linux-build-env:x86 .
 docker build --rm -f linux-build-env.arm64 -t fibjs/linux-build-env:arm64 .
 docker build --rm -f linux-build-env.arm -t fibjs/linux-build-env:arm .
 docker build --rm -f linux-build-env.mips64 -t fibjs/linux-build-env:mips64 .
 docker build --rm -f linux-build-env.ppc64 -t fibjs/linux-build-env:ppc64 .
 docker build --rm -f linux-build-env.riscv64 -t fibjs/linux-build-env:riscv64 .
 docker build --rm -f linux-build-env.loong64 -t fibjs/linux-build-env:loong64 .
 
-docker build --rm -f alpine-build-env.amd64 -t fibjs/alpine-build-env:amd64 .
-docker build --rm -f alpine-build-env.i386 -t fibjs/alpine-build-env:i386 .
+docker build --rm -f alpine-build-env.x64 -t fibjs/alpine-build-env:x64 .
+docker build --rm -f alpine-build-env.x86 -t fibjs/alpine-build-env:x86 .
 docker build --rm -f alpine-build-env.arm64 -t fibjs/alpine-build-env:arm64 .
 
-docker build --rm -f alpine-test-env.amd64 -t fibjs/alpine-test-env:amd64 .
-docker build --rm -f alpine-test-env.i386 -t fibjs/alpine-test-env:i386 .
+docker build --rm -f alpine-test-env.x64 -t fibjs/alpine-test-env:x64 .
+docker build --rm -f alpine-test-env.x86 -t fibjs/alpine-test-env:x86 .
 docker build --rm -f alpine-test-env.arm64 -t fibjs/alpine-test-env:arm64 .
 
-docker build --rm -f android-build-env.amd64 -t fibjs/android-build-env:amd64 .
-docker build --rm -f android-build-env.i386 -t fibjs/android-build-env:i386 .
+docker build --rm -f android-build-env.x64 -t fibjs/android-build-env:x64 .
+docker build --rm -f android-build-env.x86 -t fibjs/android-build-env:x86 .
 docker build --rm -f android-build-env.arm64 -t fibjs/android-build-env:arm64 .
 docker build --rm -f android-build-env.arm -t fibjs/android-build-env:arm .