diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ff94dd938..befa121f9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,24 +33,7 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 - - - name: Install Wine - run: | - dpkg --add-architecture i386 - apt-get update -y -qq - apt-get install -y -qq wine - wine --version - - - name: Init Wine prefix - env: - WINEPREFIX: ${{ github.workspace }}/tools/.wine - WINEDEBUG: "-all" - #WINEARCH: "win32" - run: | - mkdir -p $WINEPREFIX - winecfg - #wineboot -u - + - name: Set up JDKs uses: actions/setup-java@v4 with: @@ -75,34 +58,12 @@ jobs: apt-get -y install nsis makensis -VERSION - - name: Install Resource Hacker - env: - RH_DIR: ${{ github.workspace }}/tools/resourcehacker - RH_ZIP: ${{ github.workspace }}/tools/resourcehacker.zip - RH_URL: https://www.angusj.com/resourcehacker/resource_hacker.zip - run: | - set -euxo pipefail - - apt-get install -y -qq unzip wget - - mkdir -p "$(dirname "$RH_ZIP")" - mkdir -p "$RH_DIR" - - wget -O "$RH_ZIP" "$RH_URL" - unzip -o "$RH_ZIP" -d "$RH_DIR" - - # find exe (sometimes it's in subfolder) - find "$RH_DIR" -maxdepth 3 -type f -iname "ResourceHacker.exe" -print - name: Set up ant run: | apt-get install -y -qq ant - - name: Build - env: - WINEPREFIX: ${{ github.workspace }}/tools/.wine - WINEDEBUG: "-all" + - name: Build run: | export CICD_TEMP=${{ github.workspace }} chmod a+x ./cicd_scripts/*.sh ./cicd_scripts/before_install.sh - ant exe - #./cicd_scripts/script.sh + ./cicd_scripts/script.sh diff --git a/CHANGELOG.md b/CHANGELOG.md index a099567dd..0610abba3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,6 @@ All notable changes to this project will be documented in this file. - Updated German translation (AI used) - Slovak translation (AI used) - APNG (animated PNG) export for frames, sprites and morphshapes -- Version info in ffdec.exe and on its splashscreen ### Fixed - [#2603] Export Sprite as SWF - sprite frames as timeline frames, without sprite itself diff --git a/build.xml b/build.xml index 673d64cd4..c7616a4b5 100644 --- a/build.xml +++ b/build.xml @@ -404,7 +404,7 @@ - +