From c4c1bfda359906c6be75f328fa918bd77b7ff8f9 Mon Sep 17 00:00:00 2001 From: Emmanouil Papadeas Date: Sun, 7 Aug 2022 19:09:37 +0300 Subject: [PATCH] Update workflows to Godot 3.5, first attempt First and hopefully final attempt, but I'm almost sure I have done something stupid --- .github/workflows/dev-clickable-builds.yml | 4 +- .github/workflows/dev-desktop-builds.yml | 11 ++-- .github/workflows/dev-web.yml | 4 +- .github/workflows/release.yml | 15 +++--- export_presets.cfg | 61 +++++++++++++++++++--- 5 files changed, 71 insertions(+), 24 deletions(-) diff --git a/.github/workflows/dev-clickable-builds.yml b/.github/workflows/dev-clickable-builds.yml index 50bcc702f..24750ac61 100644 --- a/.github/workflows/dev-clickable-builds.yml +++ b/.github/workflows/dev-clickable-builds.yml @@ -4,7 +4,7 @@ on: branches: [ master ] env: - GODOT_VERSION: 3.4.2 + GODOT_VERSION: 3.5 EXPORT_NAME: Pixelorama jobs: @@ -12,7 +12,7 @@ jobs: name: Create Pixelorama pack data runs-on: ubuntu-latest container: - image: docker://barichello/godot-ci:3.4.2 + image: docker://barichello/godot-ci:3.5 steps: - name: Clone source uses: actions/checkout@v2 diff --git a/.github/workflows/dev-desktop-builds.yml b/.github/workflows/dev-desktop-builds.yml index 4cfa66567..bbd8d0e8f 100644 --- a/.github/workflows/dev-desktop-builds.yml +++ b/.github/workflows/dev-desktop-builds.yml @@ -11,8 +11,9 @@ on: - "installer/po/*" env: - GODOT_VERSION: 3.4.2 - GODOT_VERSION_MAC: 3.4.2 + GODOT_VERSION: 3.5 + GODOT_VERSION_MAC: 3.5 + RASPBERRY_PI_BUILDS_VERSION: 1.13.0 EXPORT_NAME: Pixelorama jobs: @@ -20,7 +21,7 @@ jobs: name: Windows Export 🗔 runs-on: ubuntu-latest container: - image: docker://barichello/godot-ci:3.4.2 + image: docker://barichello/godot-ci:3.5 steps: - name: Setup WINE and rcedit 🍷 run: | @@ -57,7 +58,7 @@ jobs: name: Linux Export 🐧 runs-on: ubuntu-latest container: - image: docker://barichello/godot-ci:3.4.2 + image: docker://barichello/godot-ci:3.5 steps: - name: Checkout 🛎️ uses: actions/checkout@v2 @@ -69,7 +70,7 @@ jobs: mv /root/.local/share/godot/templates/${GODOT_VERSION}.stable ~/.local/share/godot/templates/${GODOT_VERSION}.stable - name: Download Unofficial Godot Raspberry Pi 4 Builds 🍇 run: | - wget https://github.com/hiulit/Unofficial-Godot-Engine-Raspberry-Pi/releases/download/v1.9.0/godot_${GODOT_VERSION}-stable_rpi4.zip + wget https://github.com/hiulit/Unofficial-Godot-Engine-Raspberry-Pi/releases/download/v${RASPBERRY_PI_BUILDS_VERSION}/godot_${GODOT_VERSION}-stable_rpi4.zip unzip -a godot_${GODOT_VERSION}-stable_rpi4.zip - name: Linux Build 🔧 run: | diff --git a/.github/workflows/dev-web.yml b/.github/workflows/dev-web.yml index 9c5330348..7873573fd 100644 --- a/.github/workflows/dev-web.yml +++ b/.github/workflows/dev-web.yml @@ -5,7 +5,7 @@ on: branches: [ master ] env: - GODOT_VERSION: 3.4.2 + GODOT_VERSION: 3.5 EXPORT_NAME: Pixelorama jobs: @@ -13,7 +13,7 @@ jobs: name: Web Export 🌐 runs-on: ubuntu-latest container: - image: docker://barichello/godot-ci:3.4.2 + image: docker://barichello/godot-ci:3.5 steps: - name: Checkout 🛎️ uses: actions/checkout@v2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9db31b20c..b67fd12e4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,10 +5,11 @@ on: branches: [ release ] env: - GODOT_VERSION: 3.4.2 - GODOT_VERSION_MAC: 3.4.2 + GODOT_VERSION: 3.5 + GODOT_VERSION_MAC: 3.5 + RASPBERRY_PI_BUILDS_VERSION: 1.13.0 EXPORT_NAME: Pixelorama - TAG: v0.10.1 + TAG: v0.10.2 BUTLER_API_KEY: ${{ secrets.BUTLER_API_KEY }} jobs: @@ -16,7 +17,7 @@ jobs: name: Windows Export 🗔 runs-on: ubuntu-latest container: - image: docker://barichello/godot-ci:3.4.2 + image: docker://barichello/godot-ci:3.5 steps: - name: Setup WINE, rcedit and NSIS 🍷 run: | @@ -77,7 +78,7 @@ jobs: name: Linux Export 🐧 runs-on: ubuntu-latest container: - image: docker://barichello/godot-ci:3.4.2 + image: docker://barichello/godot-ci:3.5 steps: - name: Checkout 🛎️ uses: actions/checkout@v2 @@ -89,7 +90,7 @@ jobs: mv /root/.local/share/godot/templates/${GODOT_VERSION}.stable ~/.local/share/godot/templates/${GODOT_VERSION}.stable - name: Download Unofficial Godot Raspberry Pi 4 Builds 🍇 run: | - wget https://github.com/hiulit/Unofficial-Godot-Engine-Raspberry-Pi/releases/download/v1.9.0/godot_${GODOT_VERSION}-stable_rpi4.zip + wget https://github.com/hiulit/Unofficial-Godot-Engine-Raspberry-Pi/releases/download/v${RASPBERRY_PI_BUILDS_VERSION}/godot_${GODOT_VERSION}-stable_rpi4.zip unzip -a godot_${GODOT_VERSION}-stable_rpi4.zip - name: Linux Build 🔧 run: | @@ -190,7 +191,7 @@ jobs: name: Web Export 🌐 runs-on: ubuntu-latest container: - image: docker://barichello/godot-ci:3.4.2 + image: docker://barichello/godot-ci:3.5 steps: - name: Checkout 🛎️ uses: actions/checkout@v2 diff --git a/export_presets.cfg b/export_presets.cfg index d94f47312..dbef5850a 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -23,6 +23,7 @@ texture_format/etc=false texture_format/etc2=false texture_format/no_bptc_fallbacks=true codesign/enable=false +codesign/identity_type=0 codesign/identity="" codesign/password="" codesign/timestamp=true @@ -30,9 +31,10 @@ codesign/timestamp_server_url="" codesign/digest_algorithm=1 codesign/description="" codesign/custom_options=PoolStringArray( ) +application/modify_resources=true application/icon="res://assets/graphics/icons/icon.ico" -application/file_version="0.10.1" -application/product_version="0.10.1" +application/file_version="0.10.2.0" +application/product_version="0.10.2.0" application/company_name="Orama Interactive" application/product_name="Pixelorama" application/file_description="Pixelorama - Your free & open-source sprite editor" @@ -87,12 +89,53 @@ application/icon="res://assets/graphics/icons/icon.icns" application/identifier="com.orama-interactive.pixelorama" application/signature="" application/app_category="Graphics-design" -application/short_version="0.10.1" -application/version="0.10.1" +application/short_version="0.10.2" +application/version="0.10.2" application/copyright="Orama Interactive and contributors 2019-present" display/high_res=false -privacy/camera_usage_description="" privacy/microphone_usage_description="" +privacy/camera_usage_description="" +privacy/location_usage_description="" +privacy/address_book_usage_description="" +privacy/calendar_usage_description="" +privacy/photos_library_usage_description="" +privacy/desktop_folder_usage_description="" +privacy/documents_folder_usage_description="" +privacy/downloads_folder_usage_description="" +privacy/network_volumes_usage_description="" +privacy/removable_volumes_usage_description="" +codesign/enable=true +codesign/identity="" +codesign/timestamp=true +codesign/hardened_runtime=true +codesign/replace_existing_signature=true +codesign/entitlements/custom_file="" +codesign/entitlements/allow_jit_code_execution=false +codesign/entitlements/allow_unsigned_executable_memory=false +codesign/entitlements/allow_dyld_environment_variables=false +codesign/entitlements/disable_library_validation=false +codesign/entitlements/audio_input=false +codesign/entitlements/camera=false +codesign/entitlements/location=false +codesign/entitlements/address_book=false +codesign/entitlements/calendars=false +codesign/entitlements/photos_library=false +codesign/entitlements/apple_events=false +codesign/entitlements/debugging=false +codesign/entitlements/app_sandbox/enabled=false +codesign/entitlements/app_sandbox/network_server=false +codesign/entitlements/app_sandbox/network_client=false +codesign/entitlements/app_sandbox/device_usb=false +codesign/entitlements/app_sandbox/device_bluetooth=false +codesign/entitlements/app_sandbox/files_downloads=0 +codesign/entitlements/app_sandbox/files_pictures=0 +codesign/entitlements/app_sandbox/files_music=0 +codesign/entitlements/app_sandbox/files_movies=0 +codesign/custom_options=PoolStringArray( ) +notarization/enable=false +notarization/apple_id_name="" +notarization/apple_id_password="" +notarization/apple_team_id="" texture_format/s3tc=true texture_format/etc=false texture_format/etc2=false @@ -157,6 +200,7 @@ texture_format/etc=false texture_format/etc2=false texture_format/no_bptc_fallbacks=true codesign/enable=false +codesign/identity_type=0 codesign/identity="" codesign/password="" codesign/timestamp=true @@ -164,9 +208,10 @@ codesign/timestamp_server_url="" codesign/digest_algorithm=1 codesign/description="" codesign/custom_options=PoolStringArray( ) +application/modify_resources=true application/icon="res://assets/graphics/icons/icon.ico" -application/file_version="0.10.1" -application/product_version="0.10.1" +application/file_version="0.10.2.0" +application/product_version="0.10.2.0" application/company_name="Orama Interactive" application/product_name="Pixelorama" application/file_description="Pixelorama - Your free & open-source sprite editor" @@ -239,7 +284,7 @@ script_encryption_key="" [preset.7.options] custom_template/debug="" -custom_template/release="./godot_3.4.2-stable_rpi4_export-template_lto.bin" +custom_template/release="./godot_3.5-stable_rpi4/godot_3.5-stable_rpi4_export-template_lto.bin" binary_format/64_bits=false binary_format/embed_pck=false texture_format/bptc=false