Using the file command did not work; rely on build enviroment instead

freemint · Apr 29, 2024 · 519e232 · 519e232
1 parent 1bb3783
commit 519e232
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 24 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -9,21 +9,27 @@ on:
 jobs:
   build:
     runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        cross_tool: [ "m68k-atari-mint" ]
     steps:
       - uses: actions/checkout@v4
       - name: Install SSH keys
         if: ${{ github.event_name == 'push' }}
         env:
           SSH_ID: ${{ secrets.SSH_ID }}
         run: ./.scripts/install_ssh_id.sh
-      - name: Install packages
-        run: |
-          SYSROOT_DIR="/" ./.scripts/install-freemint.sh binutils gcc mintbin
       - name: Setup environment
         env:
           PROJECT_VERSION: "0.60.1"
+          CROSS_TOOL: ${{ matrix.cross_tool }}
         run: ./.scripts/setup_env.sh
+      - name: Install packages
+        run: |
+          SYSROOT_DIR="/" ./.scripts/install-freemint.sh binutils gcc mintbin
       - name: build
+        env:
+          CROSS_TOOL: ${{ matrix.cross_tool }}
         run: ./.scripts/build.sh
       - name: deploy
         if: ${{ github.event_name == 'push' }}

diff --git a/.scripts/build.sh b/.scripts/build.sh
@@ -3,45 +3,38 @@
 # -u: Treat unset variables as an error when substituting.
 # -x: Display expanded script commands
 
+if test "$CROSS_TOOL" = ""; then
+  CROSS_TOOL=m68k-atari-mint
+  export CROSS_TOOL
+fi
+
 make SHELL=/bin/bash
 make SHELL=/bin/bash DESTDIR="${INSTALL_DIR}" install
 
 ARCHIVE_NAME="${PROJECT_NAME}-${PROJECT_VERSION}-${SHORT_ID}"
-BINFILES="
-sbin/tzinit
-usr/sbin/tzselect
-usr/sbin/zdump
-usr/sbin/zic
-"
+BINFILES="sbin/tzinit usr/sbin/tzselect usr/sbin/zdump usr/sbin/zic"
 
-if file ${INSTALL_DIR}/usr/sbin/zic | grep a.out; then
-  TARGET=m68k-atari-mint
-elif file ${INSTALL_DIR}/usr/sbin/zic | grep ELF; then
-  TARGET=m68k-atari-mintelf
-else
-  echo "unknown file format" >&2
-  exit 2
-fi
+mkdir -p "${DEPLOY_DIR}"
 
 rm -f tz/*.o
 make -C tz DESTDIR="${INSTALL_DIR}" type=m68020 install
 cd "${INSTALL_DIR}"
-${TARGET}-strip $BINFILES
-tar cjf "${DEPLOY_DIR}/${ARCHIVE_NAME}-020.${DEPLOY_ARCHIVE} $BINFILES usr/share/zoneinfo
+: ${CROSS_TOOL}-strip $BINFILES
+tar cjf "${DEPLOY_DIR}/${ARCHIVE_NAME}-020.${DEPLOY_ARCHIVE}" $BINFILES usr/share/zoneinfo
 rm -f $BINFILES
 cd -
 
 rm -f tz/*.o
 make -C tz DESTDIR="${INSTALL_DIR}" type=coldfire install
 cd "${INSTALL_DIR}"
-${TARGET}-strip $BINFILES
-tar cjf "${DEPLOY_DIR}/${ARCHIVE_NAME}-v4e.${DEPLOY_ARCHIVE} $BINFILES usr/share/zoneinfo
+: ${CROSS_TOOL}-strip $BINFILES
+tar cjf "${DEPLOY_DIR}/${ARCHIVE_NAME}-v4e.${DEPLOY_ARCHIVE}" $BINFILES usr/share/zoneinfo
 rm -f $BINFILES
 cd -
 
 rm -f tz/*.o
 make -C tz DESTDIR="${INSTALL_DIR}" type=m68000 install
 cd "${INSTALL_DIR}"
-${TARGET}-strip $BINFILES
-tar cjf "${DEPLOY_DIR}/${ARCHIVE_NAME}-000.${DEPLOY_ARCHIVE} $BINFILES usr/share/zoneinfo
+:  ${CROSS_TOOL}-strip $BINFILES
+tar cjf "${DEPLOY_DIR}/${ARCHIVE_NAME}-000.${DEPLOY_ARCHIVE}" $BINFILES usr/share/zoneinfo
 cd -
diff --git a/.scripts/deploy.sh b/.scripts/deploy.sh
@@ -50,7 +50,7 @@ upload_file() {
 }
 
 for f in "" -000 -020 -v4e; do
-	upload_file "${DEPLOY_DIR}/${ARCHIVE_NAME}${f}.${DEPLOY_ARCHIVE}" "${UPLOAD_DIR}/${ARCHIVE_NAME}${f}.${DEPLOY_ARCHIVE}"
+	upload_file "${DEPLOY_DIR}/${ARCHIVE_NAME}${f}.${DEPLOY_ARCHIVE}" "${UPLOAD_DIR}/${PROJECT_DIR}/${ARCHIVE_NAME}${f}.${DEPLOY_ARCHIVE}"
 done
 if test -z "${CPU_TARGET}"
 then