From f09d4da90a8bba199097f1345bb178a934cc25be Mon Sep 17 00:00:00 2001 From: Davis Carlson Date: Mon, 21 Oct 2019 11:27:05 -0700 Subject: [PATCH 01/47] Update blank.yml --- .github/workflows/blank.yml | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 .github/workflows/blank.yml diff --git a/.github/workflows/blank.yml b/.github/workflows/blank.yml new file mode 100644 index 0000000..1a04550 --- /dev/null +++ b/.github/workflows/blank.yml @@ -0,0 +1,36 @@ +name: CI + +on: + pull_request: + branches: + - deploy + - master + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - name: Install dependencies + run: | + sudo apt-get update + sudo apt-get -y install wget zip unzip + - name: Download Godot Headless + run: | + wget -q https://downloads.tuxfamily.org/godotengine/3.1.1/Godot_v3.1.1-stable_linux_headless.64.zip + unzip Godot_v3.1.1-stable_linux_headless.64.zip + mv Godot_v3.1.1-stable_linux_headless.64 godot + chmod +x godot + + - name: Download Godot Export Templates + run: | + wget -q https://downloads.tuxfamily.org/godotengine/3.1.1/Godot_v3.1.1-stable_export_templates.tpz + mkdir -p ~/.local/share/godot/templates + unzip Godot_v3.1.1-stable_export_templates.tpz -d ~/.local/share/godot/templates + mv ~/.local/share/godot/templates/templates ~/.local/share/godot/templates/3.1.1.stable + - name: Export win64 build + run: | + mkdir -p win64 + ./godot --export win64 project.godot "win64/ProjectTesseract.exe" + From c8f9108fb5b4aec13f9e2ba7fcc633ea6412106d Mon Sep 17 00:00:00 2001 From: Davis Carlson Date: Mon, 21 Oct 2019 11:27:51 -0700 Subject: [PATCH 02/47] Update and rename blank.yml to test.yml --- .github/workflows/{blank.yml => test.yml} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename .github/workflows/{blank.yml => test.yml} (97%) diff --git a/.github/workflows/blank.yml b/.github/workflows/test.yml similarity index 97% rename from .github/workflows/blank.yml rename to .github/workflows/test.yml index 1a04550..8183302 100644 --- a/.github/workflows/blank.yml +++ b/.github/workflows/test.yml @@ -1,4 +1,4 @@ -name: CI +name: Test Windows Build on: pull_request: From de6092654abb9e5f257235cce1f99534eef69f3e Mon Sep 17 00:00:00 2001 From: Davis Carlson Date: Mon, 21 Oct 2019 11:30:12 -0700 Subject: [PATCH 03/47] Update test.yml --- .github/workflows/test.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8183302..3a886de 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,6 +5,9 @@ on: branches: - deploy - master + push: + branches: + - master jobs: build: From e457f5fb74e18cf54fba9f91fc182064510331a9 Mon Sep 17 00:00:00 2001 From: Davis Carlson Date: Mon, 21 Oct 2019 11:32:48 -0700 Subject: [PATCH 04/47] Update test.yml --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3a886de..519d928 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -35,5 +35,5 @@ jobs: - name: Export win64 build run: | mkdir -p win64 - ./godot --export win64 project.godot "win64/ProjectTesseract.exe" + ./godot --export "Windows Desktop" project.godot "win64/ProjectTesseract.exe" From 2ff91143342b640568c839ab18bc4b9e2910ae4f Mon Sep 17 00:00:00 2001 From: Davis Carlson Date: Mon, 21 Oct 2019 11:42:27 -0700 Subject: [PATCH 05/47] Update export_presets.cfg --- export_presets.cfg | 87 ++-------------------------------------------- 1 file changed, 3 insertions(+), 84 deletions(-) diff --git a/export_presets.cfg b/export_presets.cfg index b2e0a4c..f6b74ce 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -1,41 +1,18 @@ [preset.0] -name="HTML5" -platform="HTML5" -runnable=true -custom_features="" -export_filter="all_resources" -include_filter="" -exclude_filter="" -export_path="./public/HTML5/spin.html" -patch_list=PoolStringArray( ) -script_export_mode=1 -script_encryption_key="" - -[preset.0.options] - -vram_texture_compression/for_desktop=true -vram_texture_compression/for_mobile=false -html/custom_html_shell="" -html/head_include="" -custom_template/release="" -custom_template/debug="" - -[preset.1] - -name="Windows Desktop" +name="win64" platform="Windows Desktop" runnable=true custom_features="" export_filter="all_resources" include_filter="" exclude_filter="" -export_path="./public/Win/spin.exe" +export_path="" patch_list=PoolStringArray( ) script_export_mode=1 script_encryption_key="" -[preset.1.options] +[preset.0.options] texture_format/bptc=false texture_format/s3tc=true @@ -53,61 +30,3 @@ application/product_name="" application/file_description="" application/copyright="" application/trademarks="" - -[preset.2] - -name="Linux/X11" -platform="Linux/X11" -runnable=true -custom_features="" -export_filter="all_resources" -include_filter="" -exclude_filter="" -export_path="./public/Linux/spin.x86_64" -patch_list=PoolStringArray( ) -script_export_mode=1 -script_encryption_key="" - -[preset.2.options] - -texture_format/bptc=false -texture_format/s3tc=true -texture_format/etc=false -texture_format/etc2=false -texture_format/no_bptc_fallbacks=true -binary_format/64_bits=true -custom_template/release="" -custom_template/debug="" - - -[preset.3] - -name="Mac OSX" -platform="Mac OSX" -runnable=true -custom_features="" -export_filter="all_resources" -include_filter="" -exclude_filter="" -export_path="./public/Mac OSX/spin.app" -patch_list=PoolStringArray( ) -script_export_mode=1 -script_encryption_key="" - -[preset.3.options] - -custom_package/debug="" -custom_package/release="" -application/name="" -application/info="Made with Godot Engine" -application/icon="" -application/identifier="" -application/signature="" -application/short_version="1.0" -application/version="1.0" -application/copyright="" -display/high_res=false -texture_format/s3tc=true -texture_format/etc=false -texture_format/etc2=false - From a363a637c388d3c73c5514c653c0112777cf04fc Mon Sep 17 00:00:00 2001 From: Davis Carlson Date: Mon, 21 Oct 2019 11:42:47 -0700 Subject: [PATCH 06/47] Update test.yml --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 519d928..3a886de 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -35,5 +35,5 @@ jobs: - name: Export win64 build run: | mkdir -p win64 - ./godot --export "Windows Desktop" project.godot "win64/ProjectTesseract.exe" + ./godot --export win64 project.godot "win64/ProjectTesseract.exe" From eb4b8ee2da0a1181ab01786a70e2fae1473f71b3 Mon Sep 17 00:00:00 2001 From: Davis Carlson Date: Mon, 21 Oct 2019 14:55:58 -0700 Subject: [PATCH 07/47] Update test.yml --- .github/workflows/test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3a886de..889a7c0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,6 +15,7 @@ jobs: runs-on: ubuntu-latest steps: + - uses: actions/checkout@master - name: Install dependencies run: | sudo apt-get update @@ -35,5 +36,5 @@ jobs: - name: Export win64 build run: | mkdir -p win64 - ./godot --export win64 project.godot "win64/ProjectTesseract.exe" + ./godot --path $GITHUB_WORKSPACE --export "win64" "win64/ProjectTesseract.exe" From 419e59a908ab85d2f07379791510241f17439c13 Mon Sep 17 00:00:00 2001 From: Davis Carlson Date: Mon, 21 Oct 2019 14:59:36 -0700 Subject: [PATCH 08/47] Update export_presets.cfg --- export_presets.cfg | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/export_presets.cfg b/export_presets.cfg index f6b74ce..e0a8125 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -30,3 +30,34 @@ application/product_name="" application/file_description="" application/copyright="" application/trademarks="" + +[preset.3] + +name="macOS" +platform="Mac OSX" +runnable=true +custom_features="" +export_filter="all_resources" +include_filter="" +exclude_filter="" +export_path="" +patch_list=PoolStringArray( ) +script_export_mode=1 +script_encryption_key="" + +[preset.3.options] + +custom_package/debug="" +custom_package/release="" +application/name="" +application/info="Made with Godot Engine" +application/icon="" +application/identifier="" +application/signature="" +application/short_version="1.0" +application/version="1.0" +application/copyright="" +display/high_res=false +texture_format/s3tc=true +texture_format/etc=false +texture_format/etc2=false From 4c47a1d57bd7b806fedda188796f980ba052809d Mon Sep 17 00:00:00 2001 From: Davis Carlson Date: Mon, 21 Oct 2019 15:05:47 -0700 Subject: [PATCH 09/47] Update test.yml --- .github/workflows/test.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 889a7c0..bd4f438 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -38,3 +38,7 @@ jobs: mkdir -p win64 ./godot --path $GITHUB_WORKSPACE --export "win64" "win64/ProjectTesseract.exe" + - name: GitHub Pages Deploy + uses: maxheld83/ghpages@v0.2.1 + env: + BUILD_DIR: win64/ From 2a987d5557d6fb370e4dbcb5aa2c5c1f935b0da5 Mon Sep 17 00:00:00 2001 From: Davis Carlson Date: Mon, 21 Oct 2019 15:09:42 -0700 Subject: [PATCH 10/47] Update test.yml From 959a3a81e7e6a2cefb960f6efc5e9c5eee9ac58d Mon Sep 17 00:00:00 2001 From: Davis Carlson Date: Mon, 21 Oct 2019 15:15:51 -0700 Subject: [PATCH 11/47] Update test.yml --- .github/workflows/test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bd4f438..17233ae 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -40,5 +40,7 @@ jobs: - name: GitHub Pages Deploy uses: maxheld83/ghpages@v0.2.1 + with: + secrets: ${{ secrets.GH_PAT }} env: BUILD_DIR: win64/ From ddd09ff7bb4b370e7c28e0929fd14346b13eacc8 Mon Sep 17 00:00:00 2001 From: Davis Carlson Date: Mon, 21 Oct 2019 15:24:37 -0700 Subject: [PATCH 12/47] Update test.yml --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 17233ae..3eec13b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -41,6 +41,6 @@ jobs: - name: GitHub Pages Deploy uses: maxheld83/ghpages@v0.2.1 with: - secrets: ${{ secrets.GH_PAT }} + GH_PAT: ${{ secrets.GH_PAT }} env: BUILD_DIR: win64/ From d98dd7a7b116dc2439b4a993f234e5054f946d25 Mon Sep 17 00:00:00 2001 From: Davis Carlson Date: Mon, 21 Oct 2019 15:30:50 -0700 Subject: [PATCH 13/47] Update test.yml --- .github/workflows/test.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3eec13b..b122940 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -38,9 +38,7 @@ jobs: mkdir -p win64 ./godot --path $GITHUB_WORKSPACE --export "win64" "win64/ProjectTesseract.exe" - - name: GitHub Pages Deploy - uses: maxheld83/ghpages@v0.2.1 - with: - GH_PAT: ${{ secrets.GH_PAT }} - env: - BUILD_DIR: win64/ + - uses: actions/upload-artifact@master + with: + name: my-artifact + path: win64 From d68d8326a5aeff7ab37ddf9d4b00186d4911c9d6 Mon Sep 17 00:00:00 2001 From: Davis Carlson Date: Mon, 21 Oct 2019 15:32:48 -0700 Subject: [PATCH 14/47] Update test.yml --- .github/workflows/test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b122940..a872534 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -39,6 +39,6 @@ jobs: ./godot --path $GITHUB_WORKSPACE --export "win64" "win64/ProjectTesseract.exe" - uses: actions/upload-artifact@master - with: - name: my-artifact - path: win64 + with: + name: my-artifact + path: win64 From 4013c16dd2a7c868b0f202d264435e11e6a1b72e Mon Sep 17 00:00:00 2001 From: Davis Carlson Date: Mon, 21 Oct 2019 17:04:33 -0700 Subject: [PATCH 15/47] Update test.yml --- .github/workflows/test.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a872534..531f628 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -37,8 +37,14 @@ jobs: run: | mkdir -p win64 ./godot --path $GITHUB_WORKSPACE --export "win64" "win64/ProjectTesseract.exe" + mkdir -p macOS + ./godot --path $GITHUB_WORKSPACE --export "macOS" "macOS/ProjectTesseract.app" - uses: actions/upload-artifact@master with: - name: my-artifact + name: Windows_64 path: win64 + - uses: actions/upload-artifact@master + with: + name: macOS + path: macOS From a98117dae146e43fc604c67a9f0027632bddbd6f Mon Sep 17 00:00:00 2001 From: Davis Carlson Date: Mon, 21 Oct 2019 17:09:36 -0700 Subject: [PATCH 16/47] Update test.yml --- .github/workflows/test.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 531f628..1d77dad 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,4 +1,4 @@ -name: Test Windows Build +name: Test Windows/macOS Build on: pull_request: @@ -37,6 +37,8 @@ jobs: run: | mkdir -p win64 ./godot --path $GITHUB_WORKSPACE --export "win64" "win64/ProjectTesseract.exe" + - name: Export macOS build + run: | mkdir -p macOS ./godot --path $GITHUB_WORKSPACE --export "macOS" "macOS/ProjectTesseract.app" From 77aacb885b61bc35025731a1d404d9adc43b0949 Mon Sep 17 00:00:00 2001 From: Davis Carlson Date: Mon, 21 Oct 2019 17:10:06 -0700 Subject: [PATCH 17/47] Update export_presets.cfg --- export_presets.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/export_presets.cfg b/export_presets.cfg index e0a8125..8aeb422 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -31,7 +31,7 @@ application/file_description="" application/copyright="" application/trademarks="" -[preset.3] +[preset.1] name="macOS" platform="Mac OSX" @@ -45,7 +45,7 @@ patch_list=PoolStringArray( ) script_export_mode=1 script_encryption_key="" -[preset.3.options] +[preset.1.options] custom_package/debug="" custom_package/release="" From 8522ba999207e75c6202127aba33e365787e7965 Mon Sep 17 00:00:00 2001 From: Davis Carlson Date: Mon, 21 Oct 2019 20:38:23 -0700 Subject: [PATCH 18/47] Update test.yml --- .github/workflows/test.yml | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1d77dad..949b4a5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -35,18 +35,27 @@ jobs: mv ~/.local/share/godot/templates/templates ~/.local/share/godot/templates/3.1.1.stable - name: Export win64 build run: | - mkdir -p win64 - ./godot --path $GITHUB_WORKSPACE --export "win64" "win64/ProjectTesseract.exe" + mkdir -p builds + ./godot --path $GITHUB_WORKSPACE --export "builds" "win64/ProjectTesseract.exe" - name: Export macOS build run: | - mkdir -p macOS - ./godot --path $GITHUB_WORKSPACE --export "macOS" "macOS/ProjectTesseract.app" - + ./godot --path $GITHUB_WORKSPACE --export "builds" "macOS/ProjectTesseract.app" + + - name: Upload Windows 64bit - uses: actions/upload-artifact@master with: name: Windows_64 - path: win64 + path: builds + + - name: Upload macOS - uses: actions/upload-artifact@master with: name: macOS - path: macOS + path: builds + + - name: Deploy to Pages + uses: JamesIves/github-pages-deploy-action@master + env: + ACCESS_TOKEN: ${{ secrets.GH_PAT }} + BRANCH: gh-pages # The branch the action should deploy to. + FOLDER: builds # The folder the action should deploy. From 5c5c24e9c053b2c91a5a73aa57adec83c8285a8d Mon Sep 17 00:00:00 2001 From: Davis Carlson Date: Mon, 21 Oct 2019 20:39:16 -0700 Subject: [PATCH 19/47] Update test.yml --- .github/workflows/test.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 949b4a5..02c0e2a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -40,19 +40,16 @@ jobs: - name: Export macOS build run: | ./godot --path $GITHUB_WORKSPACE --export "builds" "macOS/ProjectTesseract.app" - - name: Upload Windows 64bit - uses: actions/upload-artifact@master with: name: Windows_64 path: builds - - name: Upload macOS - uses: actions/upload-artifact@master with: name: macOS path: builds - - name: Deploy to Pages uses: JamesIves/github-pages-deploy-action@master env: From c919035a5433b87b3d75c4a83276c227b4aca11a Mon Sep 17 00:00:00 2001 From: Davis Carlson Date: Mon, 21 Oct 2019 20:40:40 -0700 Subject: [PATCH 20/47] Update test.yml --- .github/workflows/test.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 02c0e2a..5573916 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -43,13 +43,13 @@ jobs: - name: Upload Windows 64bit - uses: actions/upload-artifact@master with: - name: Windows_64 - path: builds + name: Windows_64 + path: builds - name: Upload macOS - uses: actions/upload-artifact@master with: - name: macOS - path: builds + name: macOS + path: builds - name: Deploy to Pages uses: JamesIves/github-pages-deploy-action@master env: From 12c619cd50b76512755ade4ad7a2ca137e3a6e38 Mon Sep 17 00:00:00 2001 From: Davis Carlson Date: Mon, 21 Oct 2019 20:42:19 -0700 Subject: [PATCH 21/47] Update test.yml --- .github/workflows/test.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5573916..cad3827 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -50,9 +50,3 @@ jobs: with: name: macOS path: builds - - name: Deploy to Pages - uses: JamesIves/github-pages-deploy-action@master - env: - ACCESS_TOKEN: ${{ secrets.GH_PAT }} - BRANCH: gh-pages # The branch the action should deploy to. - FOLDER: builds # The folder the action should deploy. From 7d200a7a02c49e52d200a6b920e815e49027240d Mon Sep 17 00:00:00 2001 From: Davis Carlson Date: Mon, 21 Oct 2019 20:44:50 -0700 Subject: [PATCH 22/47] Update test.yml --- .github/workflows/test.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index cad3827..24d6007 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -40,12 +40,10 @@ jobs: - name: Export macOS build run: | ./godot --path $GITHUB_WORKSPACE --export "builds" "macOS/ProjectTesseract.app" - - name: Upload Windows 64bit - uses: actions/upload-artifact@master with: name: Windows_64 path: builds - - name: Upload macOS - uses: actions/upload-artifact@master with: name: macOS From b211f9a82b5f472c59634cd566c4f2ee01727419 Mon Sep 17 00:00:00 2001 From: Davis Carlson Date: Mon, 21 Oct 2019 20:46:15 -0700 Subject: [PATCH 23/47] Update test.yml --- .github/workflows/test.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 24d6007..fa435b9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -48,3 +48,10 @@ jobs: with: name: macOS path: builds + - name: Deploy to Pages + uses: JamesIves/github-pages-deploy-action@master + env: + ACCESS_TOKEN: ${{ secrets.GH_PAT }} + BRANCH: gh-pages # The branch the action should deploy to. + FOLDER: builds # The folder the action should deploy. + From 31d11b49b942e376c374804953f970c21d6f9295 Mon Sep 17 00:00:00 2001 From: Davis Carlson Date: Mon, 21 Oct 2019 21:02:48 -0700 Subject: [PATCH 24/47] Update test.yml --- .github/workflows/test.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index fa435b9..469d943 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -48,10 +48,9 @@ jobs: with: name: macOS path: builds - - name: Deploy to Pages - uses: JamesIves/github-pages-deploy-action@master - env: - ACCESS_TOKEN: ${{ secrets.GH_PAT }} - BRANCH: gh-pages # The branch the action should deploy to. - FOLDER: builds # The folder the action should deploy. + - name: Release + uses: fnkr/github-action-ghr@v1 + env: + GHR_PATH: builds/ + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From c88a8eb9a7ae5fd7ecd12546cbfc2c893dca817f Mon Sep 17 00:00:00 2001 From: Davis Carlson Date: Mon, 21 Oct 2019 21:03:42 -0700 Subject: [PATCH 25/47] Update test.yml --- .github/workflows/test.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 469d943..63e1dc3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -49,8 +49,8 @@ jobs: name: macOS path: builds - name: Release - uses: fnkr/github-action-ghr@v1 - env: - GHR_PATH: builds/ - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + uses: fnkr/github-action-ghr@v1 + env: + GHR_PATH: builds/ + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 8c92bdfa3e8d333c9ffa998783849efe81461f8e Mon Sep 17 00:00:00 2001 From: Davis Carlson Date: Mon, 21 Oct 2019 21:06:56 -0700 Subject: [PATCH 26/47] Update test.yml --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 63e1dc3..3d2abdb 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -50,6 +50,7 @@ jobs: path: builds - name: Release uses: fnkr/github-action-ghr@v1 + if: startsWith(github.ref, 'refs/tags/') env: GHR_PATH: builds/ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 70909750f5f4231060f2c5c5d98335aaff66fe6d Mon Sep 17 00:00:00 2001 From: Davis Carlson Date: Mon, 21 Oct 2019 21:11:19 -0700 Subject: [PATCH 27/47] Update test.yml --- .github/workflows/test.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3d2abdb..bcc9b4d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -6,8 +6,11 @@ on: - deploy - master push: - branches: + branches: - master + - deploy + tags: + - v* jobs: build: From e0e73a611b28985c3327f2054fe82d62ee74fbb7 Mon Sep 17 00:00:00 2001 From: Davis Carlson Date: Mon, 21 Oct 2019 21:20:17 -0700 Subject: [PATCH 28/47] Update test.yml --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bcc9b4d..b9e5f9f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -55,6 +55,6 @@ jobs: uses: fnkr/github-action-ghr@v1 if: startsWith(github.ref, 'refs/tags/') env: - GHR_PATH: builds/ + GHR_PATH: builds GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From af22b856454eb05646f40c8c0fb5175579bb9162 Mon Sep 17 00:00:00 2001 From: Davis Carlson Date: Mon, 21 Oct 2019 21:26:00 -0700 Subject: [PATCH 29/47] Update test.yml --- .github/workflows/test.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b9e5f9f..b3857e3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -38,23 +38,23 @@ jobs: mv ~/.local/share/godot/templates/templates ~/.local/share/godot/templates/3.1.1.stable - name: Export win64 build run: | - mkdir -p builds - ./godot --path $GITHUB_WORKSPACE --export "builds" "win64/ProjectTesseract.exe" + mkdir -p $GITHUB_WORKSPACE/builds + ./godot --path $GITHUB_WORKSPACE --export "$GITHUB_WORKSPACE/builds" "win64/ProjectTesseract.exe" - name: Export macOS build run: | - ./godot --path $GITHUB_WORKSPACE --export "builds" "macOS/ProjectTesseract.app" + ./godot --path $GITHUB_WORKSPACE --export "$GITHUB_WORKSPACE/builds" "macOS/ProjectTesseract.app" - uses: actions/upload-artifact@master with: name: Windows_64 - path: builds + path: $GITHUB_WORKSPACE/builds - uses: actions/upload-artifact@master with: name: macOS - path: builds + path: $GITHUB_WORKSPACE/builds - name: Release uses: fnkr/github-action-ghr@v1 if: startsWith(github.ref, 'refs/tags/') env: - GHR_PATH: builds + GHR_PATH: $GITHUB_WORKSPACE/builds GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From b74a125b7d651b72257ca5b16dc761d2af1b3fb0 Mon Sep 17 00:00:00 2001 From: Davis Carlson Date: Mon, 21 Oct 2019 21:29:30 -0700 Subject: [PATCH 30/47] Update test.yml --- .github/workflows/test.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b3857e3..f662818 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -39,18 +39,18 @@ jobs: - name: Export win64 build run: | mkdir -p $GITHUB_WORKSPACE/builds - ./godot --path $GITHUB_WORKSPACE --export "$GITHUB_WORKSPACE/builds" "win64/ProjectTesseract.exe" + ./godot --path $GITHUB_WORKSPACE --export "builds" "win64/ProjectTesseract.exe" - name: Export macOS build run: | - ./godot --path $GITHUB_WORKSPACE --export "$GITHUB_WORKSPACE/builds" "macOS/ProjectTesseract.app" + ./godot --path $GITHUB_WORKSPACE --export "builds" "macOS/ProjectTesseract.app" - uses: actions/upload-artifact@master with: name: Windows_64 - path: $GITHUB_WORKSPACE/builds + path: builds - uses: actions/upload-artifact@master with: name: macOS - path: $GITHUB_WORKSPACE/builds + path: builds - name: Release uses: fnkr/github-action-ghr@v1 if: startsWith(github.ref, 'refs/tags/') From f53ec50cebf38a0b5ea3e7d28ea81a5667f9fafd Mon Sep 17 00:00:00 2001 From: Davis Carlson Date: Mon, 21 Oct 2019 21:34:11 -0700 Subject: [PATCH 31/47] Update test.yml --- .github/workflows/test.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f662818..d9c4fae 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -38,19 +38,21 @@ jobs: mv ~/.local/share/godot/templates/templates ~/.local/share/godot/templates/3.1.1.stable - name: Export win64 build run: | - mkdir -p $GITHUB_WORKSPACE/builds - ./godot --path $GITHUB_WORKSPACE --export "builds" "win64/ProjectTesseract.exe" + mkdir -p builds + mkdir -p builds/win64 + ./godot --path $GITHUB_WORKSPACE --export "win64" "builds/win64/ProjectTesseract.exe" - name: Export macOS build run: | - ./godot --path $GITHUB_WORKSPACE --export "builds" "macOS/ProjectTesseract.app" + mkdir -p builds/macOS + ./godot --path $GITHUB_WORKSPACE --export "macOS" "builds/macOS/ProjectTesseract.app" - uses: actions/upload-artifact@master with: name: Windows_64 - path: builds + path: builds/win64 - uses: actions/upload-artifact@master with: name: macOS - path: builds + path: builds/macOS - name: Release uses: fnkr/github-action-ghr@v1 if: startsWith(github.ref, 'refs/tags/') From 605cba7be5694ef79a83b1fab1fd84a506d4f917 Mon Sep 17 00:00:00 2001 From: Davis Carlson Date: Mon, 21 Oct 2019 21:39:03 -0700 Subject: [PATCH 32/47] Update test.yml --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d9c4fae..72d5fa8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -57,6 +57,6 @@ jobs: uses: fnkr/github-action-ghr@v1 if: startsWith(github.ref, 'refs/tags/') env: - GHR_PATH: $GITHUB_WORKSPACE/builds + GHR_PATH: builds GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 4947063f6c603d06f9166bae7d0ae2ad5bd63998 Mon Sep 17 00:00:00 2001 From: Davis Carlson Date: Mon, 21 Oct 2019 21:55:37 -0700 Subject: [PATCH 33/47] Update test.yml --- .github/workflows/test.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 72d5fa8..19dc27b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -53,10 +53,10 @@ jobs: with: name: macOS path: builds/macOS - - name: Release - uses: fnkr/github-action-ghr@v1 - if: startsWith(github.ref, 'refs/tags/') + - name: Upload to release + uses: JasonEtco/upload-to-release@master + with: + args: builds/macOS env: - GHR_PATH: builds GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From bb913ad0dfa5da3292d23fffc86f20b6b05966b5 Mon Sep 17 00:00:00 2001 From: Davis Carlson Date: Mon, 21 Oct 2019 22:03:21 -0700 Subject: [PATCH 34/47] Update test.yml --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 19dc27b..422a2c3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -56,7 +56,7 @@ jobs: - name: Upload to release uses: JasonEtco/upload-to-release@master with: - args: builds/macOS + args: builds/macOS/ProjectTesseract.app env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 6e1e14f5e995324a1b2119c5a8e57783aa396e5f Mon Sep 17 00:00:00 2001 From: Davis Carlson Date: Mon, 21 Oct 2019 22:07:21 -0700 Subject: [PATCH 35/47] Update test.yml --- .github/workflows/test.yml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 422a2c3..e3a694d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,16 +1,6 @@ name: Test Windows/macOS Build -on: - pull_request: - branches: - - deploy - - master - push: - branches: - - master - - deploy - tags: - - v* +on: [push, release] jobs: build: From 929ef118615a5d7d587389503c9210116a363fa7 Mon Sep 17 00:00:00 2001 From: Davis Carlson Date: Mon, 21 Oct 2019 22:12:19 -0700 Subject: [PATCH 36/47] Update test.yml --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e3a694d..946be64 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -46,7 +46,7 @@ jobs: - name: Upload to release uses: JasonEtco/upload-to-release@master with: - args: builds/macOS/ProjectTesseract.app + args: builds/macOS/ProjectTesseract.app application/x-compress env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 1be0dbf7d2fbe6ff0e026b4d8dcbb11f849cb77b Mon Sep 17 00:00:00 2001 From: Davis Carlson Date: Mon, 21 Oct 2019 22:15:56 -0700 Subject: [PATCH 37/47] Update test.yml --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 946be64..efff856 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -46,7 +46,7 @@ jobs: - name: Upload to release uses: JasonEtco/upload-to-release@master with: - args: builds/macOS/ProjectTesseract.app application/x-compress + args: builds/macOS/ProjectTesseract.app application/octet-stream env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 912a9215f859190fb3e53442dbf66a1f37e37870 Mon Sep 17 00:00:00 2001 From: Davis Carlson Date: Mon, 21 Oct 2019 22:29:17 -0700 Subject: [PATCH 38/47] Update test.yml --- .github/workflows/test.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index efff856..53fa65d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,6 +1,6 @@ name: Test Windows/macOS Build -on: [push, release] +on: release jobs: build: @@ -43,10 +43,12 @@ jobs: with: name: macOS path: builds/macOS + - name: Zip macOS + run: zip -r macOS.zip "builds/macOS" - name: Upload to release uses: JasonEtco/upload-to-release@master with: - args: builds/macOS/ProjectTesseract.app application/octet-stream + args: builds/macOS.zip env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From ef917992e77dda4836137cd310d24b024c5a64f6 Mon Sep 17 00:00:00 2001 From: Davis Carlson Date: Mon, 21 Oct 2019 22:33:09 -0700 Subject: [PATCH 39/47] Update test.yml --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 53fa65d..87e138b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -48,7 +48,7 @@ jobs: - name: Upload to release uses: JasonEtco/upload-to-release@master with: - args: builds/macOS.zip + args: macOS.zip env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 0dee26a2772983d2e45532038605ddfe0b3094d1 Mon Sep 17 00:00:00 2001 From: Davis Carlson Date: Mon, 21 Oct 2019 22:37:58 -0700 Subject: [PATCH 40/47] Update test.yml --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 87e138b..36ebd7f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -48,7 +48,7 @@ jobs: - name: Upload to release uses: JasonEtco/upload-to-release@master with: - args: macOS.zip + args: macOS.zip application/octet-stream env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 1cbede4d6aa9e440902be9566eac24bb1c8e707a Mon Sep 17 00:00:00 2001 From: Davis Carlson Date: Mon, 21 Oct 2019 22:43:00 -0700 Subject: [PATCH 41/47] Update test.yml --- .github/workflows/test.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 36ebd7f..78ff079 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,6 +1,8 @@ name: Test Windows/macOS Build -on: release +on: + release: + types: [published] jobs: build: From 5f90fb114a55f937bd35b638153abcbf10064b94 Mon Sep 17 00:00:00 2001 From: Davis Carlson Date: Wed, 23 Oct 2019 18:16:03 -0700 Subject: [PATCH 42/47] Update .gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 7b2f30f..2653e7f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ .gitlab_ci.yml - +.github/workflows/ # Godot-specific ignores .import/ export.cfg From 272e33fd06d2b43509e76bf65cb340ff4ec42986 Mon Sep 17 00:00:00 2001 From: Davis Carlson Date: Wed, 23 Oct 2019 18:20:23 -0700 Subject: [PATCH 43/47] Added linux --- export_presets.cfg | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/export_presets.cfg b/export_presets.cfg index 8aeb422..316fbe1 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -25,8 +25,8 @@ custom_template/debug="" application/icon="" application/file_version="" application/product_version="" -application/company_name="" -application/product_name="" +application/company_name="Lunatic Games" +application/product_name="ProjectTesseract" application/file_description="" application/copyright="" application/trademarks="" @@ -49,15 +49,40 @@ script_encryption_key="" custom_package/debug="" custom_package/release="" -application/name="" +application/name="ProjectTesseract" application/info="Made with Godot Engine" application/icon="" application/identifier="" application/signature="" application/short_version="1.0" application/version="1.0" -application/copyright="" -display/high_res=false +application/copyright="Lunatic Games" +display/high_res=true +texture_format/s3tc=true +texture_format/etc=false +texture_format/etc2=false + +[preset.2] + +name="linux/x11" +platform="Linux/X11" +runnable=true +custom_features="" +export_filter="all_resources" +include_filter="" +exclude_filter="" +export_path="" +patch_list=PoolStringArray( ) +script_export_mode=1 +script_encryption_key="" + +[preset.2.options] + +texture_format/bptc=false texture_format/s3tc=true texture_format/etc=false texture_format/etc2=false +texture_format/no_bptc_fallbacks=true +binary_format/64_bits=true +custom_template/release="" +custom_template/debug="" From 0996ef289a4c397409be881e9946863aceee7188 Mon Sep 17 00:00:00 2001 From: Davis Carlson Date: Fri, 25 Oct 2019 13:09:03 -0700 Subject: [PATCH 44/47] Update test.yml --- .github/workflows/test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 78ff079..c3308ae 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -28,6 +28,8 @@ jobs: mkdir -p ~/.local/share/godot/templates unzip Godot_v3.1.1-stable_export_templates.tpz -d ~/.local/share/godot/templates mv ~/.local/share/godot/templates/templates ~/.local/share/godot/templates/3.1.1.stable + - name: Fail Here + run: exit - name: Export win64 build run: | mkdir -p builds From e9c3706b7686eb7a536bf7ad2354dc61a34bae12 Mon Sep 17 00:00:00 2001 From: Davis Carlson Date: Fri, 25 Oct 2019 13:17:17 -0700 Subject: [PATCH 45/47] Update test.yml --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c3308ae..1aa6c5c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -29,7 +29,7 @@ jobs: unzip Godot_v3.1.1-stable_export_templates.tpz -d ~/.local/share/godot/templates mv ~/.local/share/godot/templates/templates ~/.local/share/godot/templates/3.1.1.stable - name: Fail Here - run: exit + run: exit 1 - name: Export win64 build run: | mkdir -p builds From 8e9cda6331c8caf74ee751c24e0283fe1f379bb2 Mon Sep 17 00:00:00 2001 From: Davis Carlson Date: Fri, 25 Oct 2019 13:28:52 -0700 Subject: [PATCH 46/47] Update test.yml --- .github/workflows/test.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1aa6c5c..5a3898c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -28,8 +28,6 @@ jobs: mkdir -p ~/.local/share/godot/templates unzip Godot_v3.1.1-stable_export_templates.tpz -d ~/.local/share/godot/templates mv ~/.local/share/godot/templates/templates ~/.local/share/godot/templates/3.1.1.stable - - name: Fail Here - run: exit 1 - name: Export win64 build run: | mkdir -p builds @@ -39,6 +37,10 @@ jobs: run: | mkdir -p builds/macOS ./godot --path $GITHUB_WORKSPACE --export "macOS" "builds/macOS/ProjectTesseract.app" + - name: Test if exports were successful + run: | + [ "$(ls -A builds/macOS)" ] && echo "Full" || exit 1 + [ "$(ls -A builds/win64)" ] && echo "Full" || exit 1 - uses: actions/upload-artifact@master with: name: Windows_64 From 39e8235e46647c26c93ea5f34f63866467942c5a Mon Sep 17 00:00:00 2001 From: Davis Carlson Date: Fri, 25 Oct 2019 13:31:33 -0700 Subject: [PATCH 47/47] Update export_presets.cfg --- export_presets.cfg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/export_presets.cfg b/export_presets.cfg index 316fbe1..303ce31 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -1,6 +1,6 @@ [preset.0] -name="win64" +name="win64-1" platform="Windows Desktop" runnable=true custom_features="" @@ -33,7 +33,7 @@ application/trademarks="" [preset.1] -name="macOS" +name="macOS-1" platform="Mac OSX" runnable=true custom_features="" @@ -64,7 +64,7 @@ texture_format/etc2=false [preset.2] -name="linux/x11" +name="linux/x11-1" platform="Linux/X11" runnable=true custom_features=""