fixup i386

Author: travisg

.github/workflows/qemu-boot-tests.yml

@@ -62,15 +62,12 @@ jobs:
             m68k) TOOLCHAIN_PREFIX="m68k-elf-" ;;
             riscv32) TOOLCHAIN_PREFIX="riscv32-elf-" ;;
             riscv64) TOOLCHAIN_PREFIX="riscv64-elf-" ;;
-            x86|x86-64) TOOLCHAIN_PREFIX="x86_64-elf-" ;;
+            x86) TOOLCHAIN_PREFIX="i386-elf-" ;;
+            x86-64) TOOLCHAIN_PREFIX="x86_64-elf-" ;;
             *) echo "Unknown architecture: ${{ matrix.arch }}" && exit 1 ;;
         esac
         echo "TOOLCHAIN_PREFIX=${TOOLCHAIN_PREFIX}" >> $GITHUB_ENV
         echo "TOOLCHAIN=${TOOLCHAIN_PREFIX}${{ matrix.toolchain-ver }}-$(uname)-$(uname -m)" >> $GITHUB_ENV
-        if [ "$TOOLCHAIN_PREFIX" = "x86_64-elf-" ]; then
-          # for some x86_64-elf projects, we need i386-elf as well
-          echo "TOOLCHAIN_ALT=i386-elf-${{ matrix.toolchain-ver }}-$(uname)-$(uname -m)" >> $GITHUB_ENV
-        fi
 
     # maintain a directory archives/ in the repo
     # it will contain tarballs of various toolchains
@@ -100,23 +97,6 @@ jobs:
         tar xf archives/$TOOLCHAIN.$TOOLCHAIN_SUFFIX || exit 1
         echo "$GITHUB_WORKSPACE/$TOOLCHAIN/bin" >> $GITHUB_PATH
 
-    # if we have an alternate toolchain, download it too
-    - name: fetch/extract alternate toolchain
-      if: env.TOOLCHAIN_ALT != ''
-      shell: bash
-      run: |
-        TOOLCHAIN_BASE_URL="https://newos.org/toolchains"
-        TOOLCHAIN_SUFFIX="tar.xz"
-        TOOLCHAIN_ALT_ADDRESS="$TOOLCHAIN_BASE_URL/$TOOLCHAIN_ALT.$TOOLCHAIN_SUFFIX"
-        echo "Downloading alternate toolchain $TOOLCHAIN_ALT from $TOOLCHAIN_ALT_ADDRESS"
-        mkdir -p archives
-        cd archives
-        wget -v -N $TOOLCHAIN_ALT_ADDRESS || exit 1
-        cd ..
-        echo "Unpacking $TOOLCHAIN_ALT"
-        tar xf archives/$TOOLCHAIN_ALT.$TOOLCHAIN_SUFFIX || exit 1
-        echo "$GITHUB_WORKSPACE/$TOOLCHAIN_ALT/bin" >> $GITHUB_PATH
-
     # run the boot test for this architecture
     - name: run boot test
       shell: bash