diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4fc7ebc..9aab9b8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,6 +9,9 @@ on: jobs: build: runs-on: ubuntu-20.04 + strategy: + matrix: + cross_tool: [ "m68k-atari-mint" ] steps: - uses: actions/checkout@v4 - name: Install SSH keys @@ -16,14 +19,17 @@ jobs: 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 index 85e2438..6b3d7ee 100755 --- a/.scripts/build.sh +++ b/.scripts/build.sh @@ -3,30 +3,21 @@ # -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 -" - -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 +BINFILES="sbin/tzinit usr/sbin/tzselect usr/sbin/zdump usr/sbin/zic" rm -f tz/*.o make -C tz DESTDIR="${INSTALL_DIR}" type=m68020 install cd "${INSTALL_DIR}" -${TARGET}-strip $BINFILES +: ${CROSS_TOOL}-strip $BINFILES tar cjf "${DEPLOY_DIR}/${ARCHIVE_NAME}-020.${DEPLOY_ARCHIVE} $BINFILES usr/share/zoneinfo rm -f $BINFILES cd - @@ -34,7 +25,7 @@ cd - rm -f tz/*.o make -C tz DESTDIR="${INSTALL_DIR}" type=coldfire install cd "${INSTALL_DIR}" -${TARGET}-strip $BINFILES +: ${CROSS_TOOL}-strip $BINFILES tar cjf "${DEPLOY_DIR}/${ARCHIVE_NAME}-v4e.${DEPLOY_ARCHIVE} $BINFILES usr/share/zoneinfo rm -f $BINFILES cd - @@ -42,6 +33,6 @@ cd - rm -f tz/*.o make -C tz DESTDIR="${INSTALL_DIR}" type=m68000 install cd "${INSTALL_DIR}" -${TARGET}-strip $BINFILES +: ${CROSS_TOOL}-strip $BINFILES tar cjf "${DEPLOY_DIR}/${ARCHIVE_NAME}-000.${DEPLOY_ARCHIVE} $BINFILES usr/share/zoneinfo cd -