github: Do not build and install vasm & vlink

vlink is not used. vasm is installed by bebbo's amiga-gcc repo.
keirf · Jan 5, 2025 · 1d0b955 · 1d0b955
1 parent bc655bb
commit 1d0b955
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 22 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -31,7 +31,7 @@ jobs:
       uses: actions/cache@v3
       with:
         path: ~/cross
-        key: ${{ runner.os }}-${{ env.BINUTILS_RELEASE }}-${{ env.GCC_RELEASE }}-2
+        key: ${{ runner.os }}-${{ env.BINUTILS_RELEASE }}-${{ env.GCC_RELEASE }}-3
 
     - name: Build toolchain
       if: steps.cache-toolchain.outputs.cache-hit != 'true'
@@ -46,12 +46,8 @@ jobs:
         mkdir ~/_tc && cd ~/_tc
         wget https://ftp.gnu.org/gnu/binutils/binutils-${BINUTILS_RELEASE}.tar.xz
         wget https://ftp.gnu.org/gnu/gcc/gcc-${GCC_RELEASE}/gcc-${GCC_RELEASE}.tar.xz
-        wget http://sun.hasenbraten.de/vasm/release/vasm.tar.gz
-        wget http://sun.hasenbraten.de/vlink/release/vlink.tar.gz
         tar xf binutils-${BINUTILS_RELEASE}.tar.xz
         tar xf gcc-${GCC_RELEASE}.tar.xz
-        tar xf vasm.tar.gz
-        tar xf vlink.tar.gz
         cd binutils-${BINUTILS_RELEASE}
         ./configure --prefix=$MDIR --target=m68k-elf
         make ${MAKE_OPTS}
@@ -63,12 +59,6 @@ jobs:
         ../gcc-${GCC_RELEASE}/configure --prefix=$MDIR --target=m68k-elf --enable-languages=c --disable-libssp
         make ${MAKE_OPTS}
         make install
-        cd ../vasm
-        make ${MAKE_OPTS} CPU=m68k SYNTAX=mot
-        cp vasmm68k_mot vobjdump $MDIR/bin/
-        cd ../vlink
-        make ${MAKE_OPTS}
-        cp vlink $MDIR/bin/
         cd ..
         git clone https://github.com/bebbo/amiga-gcc.git
         cd amiga-gcc

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -34,7 +34,7 @@ jobs:
       uses: actions/cache@v3
       with:
         path: ~/cross
-        key: ${{ runner.os }}-${{ env.BINUTILS_RELEASE }}-${{ env.GCC_RELEASE }}-2
+        key: ${{ runner.os }}-${{ env.BINUTILS_RELEASE }}-${{ env.GCC_RELEASE }}-3
 
     - name: Build toolchain
       if: steps.cache-toolchain.outputs.cache-hit != 'true'
@@ -49,12 +49,8 @@ jobs:
         mkdir ~/_tc && cd ~/_tc
         wget https://ftp.gnu.org/gnu/binutils/binutils-${BINUTILS_RELEASE}.tar.xz
         wget https://ftp.gnu.org/gnu/gcc/gcc-${GCC_RELEASE}/gcc-${GCC_RELEASE}.tar.xz
-        wget http://sun.hasenbraten.de/vasm/release/vasm.tar.gz
-        wget http://sun.hasenbraten.de/vlink/release/vlink.tar.gz
         tar xf binutils-${BINUTILS_RELEASE}.tar.xz
         tar xf gcc-${GCC_RELEASE}.tar.xz
-        tar xf vasm.tar.gz
-        tar xf vlink.tar.gz
         cd binutils-${BINUTILS_RELEASE}
         ./configure --prefix=$MDIR --target=m68k-elf
         make ${MAKE_OPTS}
@@ -66,12 +62,6 @@ jobs:
         ../gcc-${GCC_RELEASE}/configure --prefix=$MDIR --target=m68k-elf --enable-languages=c --disable-libssp
         make ${MAKE_OPTS}
         make install
-        cd ../vasm
-        make ${MAKE_OPTS} CPU=m68k SYNTAX=mot
-        cp vasmm68k_mot vobjdump $MDIR/bin/
-        cd ../vlink
-        make ${MAKE_OPTS}
-        cp vlink $MDIR/bin/
         cd ..
         git clone https://github.com/bebbo/amiga-gcc.git
         cd amiga-gcc