From 1424d350623cdf57b3a5877bbf99f7edf4ca6ff7 Mon Sep 17 00:00:00 2001 From: Your Name Date: Wed, 20 Nov 2024 10:46:13 -0500 Subject: [PATCH] enable mac build again for troubleshooting --- .github/workflows/release.yaml | 126 ++++++++++++++++++++++++++++--- mk_zip.sh | 0 skunkcrafts_updater.cfg.template | 7 ++ sync_xp11_pkg.sh | 0 4 files changed, 124 insertions(+), 9 deletions(-) mode change 100644 => 100755 mk_zip.sh create mode 100644 skunkcrafts_updater.cfg.template mode change 100644 => 100755 sync_xp11_pkg.sh diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 0bf2e50..65edb6d 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -4,23 +4,20 @@ on: push: tags: - 'v*' + branches: + - 'alt-build' workflow_dispatch: jobs: - build: + build-linux-macos: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest] #, macos-latest] + os: [ubuntu-latest, macos-latest] fail-fast: false steps: - uses: actions/checkout@v3 - - uses: melusina-org/setup-macports@v1 - if: startsWith(matrix.os, 'macos') - with: - macports-version: 2.7.1 - - name: Get XPlane SDK shell: bash run: | @@ -29,6 +26,11 @@ jobs: unzip XPSDK${SDK_VERSION}.zip mv SDK ../ + - uses: melusina-org/setup-macports@v1 + if: startsWith(matrix.os, 'macos') + with: + macports-version: 2.7.1 + - name: Build Executable shell: bash env: @@ -38,6 +40,7 @@ jobs: sudo apt-get -y install libopenal1 libopenal-dev make -f Makefile.lin64 else + port selfupdate port install expat +universal make -f Makefile.mac64 fi @@ -51,9 +54,8 @@ jobs: path: | binary.tar - release: + build-windows: runs-on: windows-latest - needs: build steps: - uses: msys2/setup-msys2@v2 @@ -86,6 +88,27 @@ jobs: run: | pwd make -f Makefile.mgw64 OPENAL=./libOpenAL32-main + tar cvf binary.tar openSAM-pkg*/openSAM/*_x64 + + - name: Upload Build Artifact + uses: actions/upload-artifact@v4 + with: + name: build-windows + path: | + binary.tar + + release: + runs-on: ubuntu-latest + needs: [build-linux-macos, build-windows] + + steps: + - uses: actions/checkout@v3 + + - name: setup crc32 tool + shell: bash + run: | + sudo apt-get update + sudo apt-get install -y libarchive-zip-perl - name: Download Build Artifacts uses: actions/download-artifact@v4 @@ -110,10 +133,95 @@ jobs: ls -l for z in openSAM*.zip; do unzip -t $z; done + - name: Prepare Skunkcrafts Updater + shell: bash + run: | + set -x + # at this point version.mak should have the version number + source version.mak + + for XP_VERSION in XP11 XP12; do + OPENSAM_ARTIFACT=openSAM_${XP_VERSION}-${VERSION} + OPENSAM_FOLDER=release/${XP_VERSION}/openSAM + OPENSAM_LIBRARY_FOLDER=release/${XP_VERSION}/openSAM_Library + + mkdir -p ${OPENSAM_FOLDER} + mkdir -p ${OPENSAM_FOLDER}/lua + mkdir -p ${OPENSAM_LIBRARY_FOLDER} + + if [ $XP_VERSION == "XP11" ]; then + unzip openSAM_XP11-${VERSION}.zip -d ${OPENSAM_ARTIFACT} + else + # normalize folder name + unzip openSAM-${VERSION}.zip -d ${OPENSAM_ARTIFACT} + fi + + echo "=============== OPEN SAM ARTIFACT ===============" + cp -r ${OPENSAM_ARTIFACT}/openSAM/* ${OPENSAM_FOLDER} + cp -r openSAM-pkg/lua/* ${OPENSAM_FOLDER}/lua + cp -r ${OPENSAM_ARTIFACT}/LICENSE ${OPENSAM_FOLDER}/LICENSE + cp -r ${OPENSAM_ARTIFACT}/Credits_and_Licensing.txt ${OPENSAM_FOLDER}/Credits_and_Licensing.txt + cp -r ${OPENSAM_ARTIFACT}/00_README.txt ${OPENSAM_FOLDER}/00_README.txt + echo + + echo "=============== OPEN SAM LIBRARY ARTIFACT ===============" + cp -r ${OPENSAM_ARTIFACT}/openSAM_Library/* ${OPENSAM_LIBRARY_FOLDER} + cp -r ${OPENSAM_ARTIFACT}/LICENSE ${OPENSAM_LIBRARY_FOLDER}/LICENSE + cp -r ${OPENSAM_ARTIFACT}/Credits_and_Licensing.txt ${OPENSAM_LIBRARY_FOLDER}/Credits_and_Licensing.txt + cp -r ${OPENSAM_ARTIFACT}/00_README.txt ${OPENSAM_LIBRARY_FOLDER}/00_README.txt + + ## skunkcrafts for openSAM_Library + sed -e "s|@FOLDER_NAME@|${OPENSAM_LIBRARY_FOLDER}|g" \ + -e "s|@XP_VERSION@|${XP_VERSION}|g" \ + -e "s|@VERSION@|${VERSION}|g" \ + -e "s|@NAME@|Library|g" \ + skunkcrafts_updater.cfg.template > "${OPENSAM_LIBRARY_FOLDER}/skunkcrafts_updater.cfg" + ## skunkcrafts for openSAM + sed -e "s|@FOLDER_NAME@|${OPENSAM_FOLDER}|g" \ + -e "s|@XP_VERSION@|${XP_VERSION}|g" \ + -e "s|@VERSION@|${VERSION}|g" \ + -e "s|@NAME@||g" \ + skunkcrafts_updater.cfg.template > "${OPENSAM_FOLDER}/skunkcrafts_updater.cfg" + + find ${OPENSAM_FOLDER}/ -type f ! \( -name '*skunkcrafts_updater*' -o -path '*skunkcrafts_updater*' \) -print0 | while IFS= read -r -d '' file; do + checksum_hex=$(crc32 "$file") + # Convert hex checksum to uint32 decimal + checksum_decimal=$((16#$checksum_hex)) + # Remove "release/" prefix from $file + modified_file="${file#${OPENSAM_FOLDER}/}" + echo "$modified_file|$checksum_decimal" >> ${OPENSAM_FOLDER}/skunkcrafts_updater_whitelist.txt + done + + find ${OPENSAM_LIBRARY_FOLDER}/ -type f ! \( -name '*skunkcrafts_updater*' -o -path '*skunkcrafts_updater*' \) -print0 | while IFS= read -r -d '' file; do + checksum_hex=$(crc32 "$file") + # Convert hex checksum to uint32 decimal + checksum_decimal=$((16#$checksum_hex)) + # Remove "release/" prefix from $file + modified_file="${file#${OPENSAM_LIBRARY_FOLDER}/}" + echo "$modified_file|$checksum_decimal" >> ${OPENSAM_LIBRARY_FOLDER}/skunkcrafts_updater_whitelist.txt + done + + touch ${OPENSAM_FOLDER}/skunkcrafts_updater_blacklist.txt + touch ${OPENSAM_LIBRARY_FOLDER}/skunkcrafts_updater_blacklist.txt + done + + + # push to release branch + git checkout -b release + git config --global user.email "release@opensam.com" + git config --global user.name "GH Release" + git add release/ + git commit -m "Release ${VERSION}" + git push -f -u origin release + + + + - name: Create Release id: create_release uses: softprops/action-gh-release@v1 with: + tag_name: ${{ github.ref }} files: | ${{ github.workspace }}/openSAM*.zip prerelease: ${{ contains(github.ref_name, '-') }} \ No newline at end of file diff --git a/mk_zip.sh b/mk_zip.sh old mode 100644 new mode 100755 diff --git a/skunkcrafts_updater.cfg.template b/skunkcrafts_updater.cfg.template new file mode 100644 index 0000000..d41d4f9 --- /dev/null +++ b/skunkcrafts_updater.cfg.template @@ -0,0 +1,7 @@ +zone|custom +liveries|false +module|https://raw.githubusercontent.com/hotbso/openSAM/refs/heads/release/@FOLDER_NAME@/ +version|@VERSION@ +disabled|false +name|openSAM @NAME@ @XP_VERSION@ +locked|false \ No newline at end of file diff --git a/sync_xp11_pkg.sh b/sync_xp11_pkg.sh old mode 100644 new mode 100755