From 9688b9c625448a610364e183b673b9302288da8b Mon Sep 17 00:00:00 2001 From: mohithsrao Date: Fri, 25 Dec 2020 13:48:02 +0530 Subject: [PATCH 01/47] Made Pawns visible while selecting The pawns were geting hidden behind other sprites previousely. I have updated the z-index of all the pawns belonging to the selcted player so that they are drawn above other sprites during selection of pawn for movement. After the movement is complete the z-index is reset back to 0 so that teh next player pawns can be drawn in front --- ChoukaBaraGame/Scenes/Gara/GaraPopup.tscn | 17 +++++++++-------- ChoukaBaraGame/Scripts/Gara/GaraPopup.gd | 10 +++++++--- ChoukaBaraGame/Scripts/Player/Player.gd | 9 ++++++++- .../StateMachine/GameStateMachine/SelectPawn.gd | 2 ++ 4 files changed, 26 insertions(+), 12 deletions(-) diff --git a/ChoukaBaraGame/Scenes/Gara/GaraPopup.tscn b/ChoukaBaraGame/Scenes/Gara/GaraPopup.tscn index b39219c..149f69d 100644 --- a/ChoukaBaraGame/Scenes/Gara/GaraPopup.tscn +++ b/ChoukaBaraGame/Scenes/Gara/GaraPopup.tscn @@ -4,6 +4,7 @@ [ext_resource path="res://Scripts/Gara/GaraPopup.gd" type="Script" id=2] [node name="GaraPopup" type="AcceptDialog"] +visible = true anchor_right = 0.646 anchor_bottom = 0.656 margin_right = -0.160034 @@ -31,7 +32,7 @@ __meta__ = { } [node name="HBoxContainer2" type="HBoxContainer" parent="VBoxContainer"] -margin_right = 604.0 +margin_right = 707.0 margin_bottom = 284.0 size_flags_horizontal = 3 size_flags_vertical = 3 @@ -41,17 +42,17 @@ __meta__ = { } [node name="koude01" parent="VBoxContainer/HBoxContainer2" instance=ExtResource( 1 )] -margin_right = 300.0 +margin_right = 351.0 margin_bottom = 284.0 [node name="koude02" parent="VBoxContainer/HBoxContainer2" instance=ExtResource( 1 )] -margin_left = 304.0 -margin_right = 604.0 +margin_left = 355.0 +margin_right = 707.0 margin_bottom = 284.0 [node name="HBoxContainer3" type="HBoxContainer" parent="VBoxContainer"] margin_top = 288.0 -margin_right = 604.0 +margin_right = 707.0 margin_bottom = 572.0 size_flags_horizontal = 3 size_flags_vertical = 3 @@ -61,10 +62,10 @@ __meta__ = { } [node name="koude03" parent="VBoxContainer/HBoxContainer3" instance=ExtResource( 1 )] -margin_right = 300.0 +margin_right = 351.0 margin_bottom = 284.0 [node name="koude04" parent="VBoxContainer/HBoxContainer3" instance=ExtResource( 1 )] -margin_left = 304.0 -margin_right = 604.0 +margin_left = 355.0 +margin_right = 707.0 margin_bottom = 284.0 diff --git a/ChoukaBaraGame/Scripts/Gara/GaraPopup.gd b/ChoukaBaraGame/Scripts/Gara/GaraPopup.gd index 8cbd24e..86e5180 100644 --- a/ChoukaBaraGame/Scripts/Gara/GaraPopup.gd +++ b/ChoukaBaraGame/Scripts/Gara/GaraPopup.gd @@ -18,7 +18,7 @@ var multiplier:float; # Called when the node enters the scene tree for the first time. func _ready(): - randomize() + randomize() if(is_Debug): multiplier = 0.01 else: @@ -28,6 +28,7 @@ func _ready(): garaList.clear() koude04.connect("roll_finished",self,"_on_koude_roll_finished") addButton.visible = false + var _error = connect("popup_hide",self,"_on_garapopup_hide") popup_centered() while repeat: list.append(getState()) @@ -48,8 +49,7 @@ func _ready(): yield(self,"custom_action") addButton.visible = false - okButton.visible = true - emit_signal("gara_completed",garaList) + okButton.visible = true func getState() -> bool: # return true @@ -73,3 +73,7 @@ func update_gara_text() -> String: text += scoreText return text + +func _on_garapopup_hide(): + emit_signal("gara_completed",garaList) + emit_signal("confirmed") diff --git a/ChoukaBaraGame/Scripts/Player/Player.gd b/ChoukaBaraGame/Scripts/Player/Player.gd index dfad5bf..d9f3c88 100644 --- a/ChoukaBaraGame/Scripts/Player/Player.gd +++ b/ChoukaBaraGame/Scripts/Player/Player.gd @@ -44,7 +44,7 @@ func _ready(): func _on_homeBase_area_entered(area:Area2D): var pawn = area.get_parent() pawn.call_deferred("disableHitBox") - + func allignNavigationNode() -> void: navigation.position = PlayerInfo.navigationData[player_index].position navigation.rotation_degrees = PlayerInfo.navigationData[player_index].rotation @@ -54,3 +54,10 @@ func allignNavigationNode() -> void: func getHomebasePosition() -> Vector2: return homeBase.position +func SetZIndex(bringFront:bool): + for child in get_children(): + if child is Pawn: + if bringFront: + (child as Pawn).z_index = 1 + else: + (child as Pawn).z_index = 0 diff --git a/ChoukaBaraGame/Scripts/StateMachine/GameStateMachine/SelectPawn.gd b/ChoukaBaraGame/Scripts/StateMachine/GameStateMachine/SelectPawn.gd index 83e0323..1a4de15 100644 --- a/ChoukaBaraGame/Scripts/StateMachine/GameStateMachine/SelectPawn.gd +++ b/ChoukaBaraGame/Scripts/StateMachine/GameStateMachine/SelectPawn.gd @@ -5,12 +5,14 @@ func enter(logic_root): # when player finishes the turn or cannot move any pawn if(PlayerInfo.garaList.empty()): yield(get_tree().create_timer(0.5),"timeout") + PlayerInfo.active_player.SetZIndex(false) if(PlayerInfo.active_player && PlayerInfo.active_player.needsReRoll): PlayerInfo.active_player.needsReRoll = false emit_signal("finished","CalculateGara") else: emit_signal("finished","SelectNextPlayer") else: + PlayerInfo.active_player.SetZIndex(true) yield(PlayerInfo.active_player,"pawnSelected") PlayerInfo.active_player.selectedPawn.call_deferred("enableHitBox",true) emit_signal("finished","MovePawn") From 26008a66cb0f0cfb17ddebe22b0d233259ed5827 Mon Sep 17 00:00:00 2001 From: mohithsrao Date: Sat, 26 Dec 2020 10:38:05 +0530 Subject: [PATCH 02/47] Update main.yml --- .github/workflows/main.yml | 56 ++++++++++++++++++++++++-------------- 1 file changed, 36 insertions(+), 20 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fa5a46b..8b369ea 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,9 +4,12 @@ name: CI # Controls when the action will run. Triggers the workflow on push or pull request # events but only for the master branch +# on: +# push: +# branches: [ master ] on: - push: - branches: [ master ] + push: {} # Runs on all Push + pull_request: {} # Runs on all Pull-Request # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: @@ -18,6 +21,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] + platform: [ChoukaBara-Windows, ChoukaBara-HTML5] env: working-directory: godotHtml @@ -26,17 +30,29 @@ jobs: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v2 with: - fetch-depth: 0 + lfs: true - - name: Godot Export - uses: firebelley/godot-export@v2.4.0 - with: - godot_executable_download_url: https://downloads.tuxfamily.org/godotengine/3.2.2/Godot_v3.2.2-stable_linux_headless.64.zip - godot_export_templates_download_url: https://downloads.tuxfamily.org/godotengine/3.2.2/Godot_v3.2.2-stable_export_templates.tpz - relative_project_path: ./ChoukaBaraGame/ - generate_release_notes: true - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # - name: Godot Export + # uses: firebelley/godot-export@v2.4.0 + # with: + # godot_executable_download_url: https://downloads.tuxfamily.org/godotengine/3.2.2/Godot_v3.2.2-stable_linux_headless.64.zip + # godot_export_templates_download_url: https://downloads.tuxfamily.org/godotengine/3.2.2/Godot_v3.2.2-stable_export_templates.tpz + # relative_project_path: ./ChoukaBaraGame/ + # generate_release_notes: true + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Build Godot Project + id: Build + uses: josephbmanley/build-godot-action@v1.4.0 + with: + name: ChoukaBara + preset: ${{ matrix.platform }} + debugMode: "true" + projectDir: "./ChoukaBaraGame/" + package: "true" + subdirectory: ${{ matrix.platform }} + - name: Create Build Directory run: | @@ -46,11 +62,11 @@ jobs: cd - mv ${{ env.working-directory }}/ChoukaBara.html ${{ env.working-directory }}/index.html - - name: Deploy Game HTML5 Site - if: success() - uses: crazy-max/ghaction-github-pages@v2 - with: - target_branch: gh-pages - build_dir: ${{ env.working-directory }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # - name: Deploy Game HTML5 Site + # if: success() + # uses: crazy-max/ghaction-github-pages@v2 + # with: + # target_branch: gh-pages + # build_dir: ${{ env.working-directory }} + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From e41788d923ea51261d91e32d19dfd24b0ea8353a Mon Sep 17 00:00:00 2001 From: mohithsrao Date: Sat, 26 Dec 2020 10:40:41 +0530 Subject: [PATCH 03/47] Corrected Syntax --- .github/workflows/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8b369ea..f58df55 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -43,7 +43,6 @@ jobs: # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Build Godot Project - id: Build uses: josephbmanley/build-godot-action@v1.4.0 with: name: ChoukaBara From 55fe301b6178da1131a6ee9dae97f5841a3328e7 Mon Sep 17 00:00:00 2001 From: mohithsrao Date: Sat, 26 Dec 2020 10:44:51 +0530 Subject: [PATCH 04/47] Corrected syntax --- .github/workflows/main.yml | 84 +++++++++++++++++++------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f58df55..4ccb065 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,45 +27,45 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 - with: - lfs: true - - # - name: Godot Export - # uses: firebelley/godot-export@v2.4.0 - # with: - # godot_executable_download_url: https://downloads.tuxfamily.org/godotengine/3.2.2/Godot_v3.2.2-stable_linux_headless.64.zip - # godot_export_templates_download_url: https://downloads.tuxfamily.org/godotengine/3.2.2/Godot_v3.2.2-stable_export_templates.tpz - # relative_project_path: ./ChoukaBaraGame/ - # generate_release_notes: true - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Build Godot Project - uses: josephbmanley/build-godot-action@v1.4.0 - with: - name: ChoukaBara - preset: ${{ matrix.platform }} - debugMode: "true" - projectDir: "./ChoukaBaraGame/" - package: "true" - subdirectory: ${{ matrix.platform }} - - - - name: Create Build Directory - run: | - mkdir ${{ env.working-directory }} - cd "/home/runner/.local/share/godot/builds/ChoukaBara-HTML5" - cp -v * /home/runner/work/GodotGameChoukaBara/GodotGameChoukaBara/${{ env.working-directory }} - cd - - mv ${{ env.working-directory }}/ChoukaBara.html ${{ env.working-directory }}/index.html - - # - name: Deploy Game HTML5 Site - # if: success() - # uses: crazy-max/ghaction-github-pages@v2 - # with: - # target_branch: gh-pages - # build_dir: ${{ env.working-directory }} - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - uses: actions/checkout@v2 + with: + lfs: true + + # - name: Godot Export + # uses: firebelley/godot-export@v2.4.0 + # with: + # godot_executable_download_url: https://downloads.tuxfamily.org/godotengine/3.2.2/Godot_v3.2.2-stable_linux_headless.64.zip + # godot_export_templates_download_url: https://downloads.tuxfamily.org/godotengine/3.2.2/Godot_v3.2.2-stable_export_templates.tpz + # relative_project_path: ./ChoukaBaraGame/ + # generate_release_notes: true + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Build Godot Project + uses: josephbmanley/build-godot-action@v1.4.0 + with: + name: ChoukaBara + preset: ${{ matrix.platform }} + debugMode: "true" + projectDir: "./ChoukaBaraGame/" + package: "true" + subdirectory: ${{ matrix.platform }} + + + - name: Create Build Directory + run: | + mkdir ${{ env.working-directory }} + cd "/home/runner/.local/share/godot/builds/ChoukaBara-HTML5" + cp -v * /home/runner/work/GodotGameChoukaBara/GodotGameChoukaBara/${{ env.working-directory }} + cd - + mv ${{ env.working-directory }}/ChoukaBara.html ${{ env.working-directory }}/index.html + + # - name: Deploy Game HTML5 Site + # if: success() + # uses: crazy-max/ghaction-github-pages@v2 + # with: + # target_branch: gh-pages + # build_dir: ${{ env.working-directory }} + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 2e91f5bbabcfc370dae5c68f4d19d074e6e89d9e Mon Sep 17 00:00:00 2001 From: mohithsrao Date: Sat, 26 Dec 2020 10:50:51 +0530 Subject: [PATCH 05/47] Used default build task --- .github/workflows/build.yml | 28 +++++++++++++ .github/workflows/main.yml | 81 +++++++++++++++---------------------- 2 files changed, 61 insertions(+), 48 deletions(-) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..12bc5e4 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,28 @@ +name: Build Godot Project + +on: + push: {} # Runs on all Push + pull_request: {} # Runs on all Pull-Request + +jobs: + Godot: + runs-on: ubuntu-latest + strategy: + matrix: + platform: [ChoukaBara-Windows, ChoukaBara-HTML5] + steps: + - uses: actions/checkout@v2 + with: + lfs: true + - name: Build + id: build + uses: josephbmanley/build-godot-action@v1.4.0 + with: + name: example + preset: ${{ matrix.platform }} + debugMode: "true" + - name: Upload Artifact + uses: actions/upload-artifact@v2 + with: + name: Client - ${{ matrix.platform }} + path: ${{ github.workspace }}/${{ steps.build.outputs.build }} \ No newline at end of file diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4ccb065..fa5a46b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,12 +4,9 @@ name: CI # Controls when the action will run. Triggers the workflow on push or pull request # events but only for the master branch -# on: -# push: -# branches: [ master ] on: - push: {} # Runs on all Push - pull_request: {} # Runs on all Pull-Request + push: + branches: [ master ] # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: @@ -21,51 +18,39 @@ jobs: strategy: matrix: os: [ubuntu-latest] - platform: [ChoukaBara-Windows, ChoukaBara-HTML5] env: working-directory: godotHtml # Steps represent a sequence of tasks that will be executed as part of the job steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 - with: - lfs: true - - # - name: Godot Export - # uses: firebelley/godot-export@v2.4.0 - # with: - # godot_executable_download_url: https://downloads.tuxfamily.org/godotengine/3.2.2/Godot_v3.2.2-stable_linux_headless.64.zip - # godot_export_templates_download_url: https://downloads.tuxfamily.org/godotengine/3.2.2/Godot_v3.2.2-stable_export_templates.tpz - # relative_project_path: ./ChoukaBaraGame/ - # generate_release_notes: true - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Build Godot Project - uses: josephbmanley/build-godot-action@v1.4.0 - with: - name: ChoukaBara - preset: ${{ matrix.platform }} - debugMode: "true" - projectDir: "./ChoukaBaraGame/" - package: "true" - subdirectory: ${{ matrix.platform }} - - - - name: Create Build Directory - run: | - mkdir ${{ env.working-directory }} - cd "/home/runner/.local/share/godot/builds/ChoukaBara-HTML5" - cp -v * /home/runner/work/GodotGameChoukaBara/GodotGameChoukaBara/${{ env.working-directory }} - cd - - mv ${{ env.working-directory }}/ChoukaBara.html ${{ env.working-directory }}/index.html - - # - name: Deploy Game HTML5 Site - # if: success() - # uses: crazy-max/ghaction-github-pages@v2 - # with: - # target_branch: gh-pages - # build_dir: ${{ env.working-directory }} - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + + - name: Godot Export + uses: firebelley/godot-export@v2.4.0 + with: + godot_executable_download_url: https://downloads.tuxfamily.org/godotengine/3.2.2/Godot_v3.2.2-stable_linux_headless.64.zip + godot_export_templates_download_url: https://downloads.tuxfamily.org/godotengine/3.2.2/Godot_v3.2.2-stable_export_templates.tpz + relative_project_path: ./ChoukaBaraGame/ + generate_release_notes: true + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Create Build Directory + run: | + mkdir ${{ env.working-directory }} + cd "/home/runner/.local/share/godot/builds/ChoukaBara-HTML5" + cp -v * /home/runner/work/GodotGameChoukaBara/GodotGameChoukaBara/${{ env.working-directory }} + cd - + mv ${{ env.working-directory }}/ChoukaBara.html ${{ env.working-directory }}/index.html + + - name: Deploy Game HTML5 Site + if: success() + uses: crazy-max/ghaction-github-pages@v2 + with: + target_branch: gh-pages + build_dir: ${{ env.working-directory }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 322793e831adf58026413b7dd67b5bb6485580cf Mon Sep 17 00:00:00 2001 From: mohithsrao Date: Sat, 26 Dec 2020 10:56:10 +0530 Subject: [PATCH 06/47] Updated directory for build task --- .github/workflows/build.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 12bc5e4..41696d3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,11 +18,14 @@ jobs: id: build uses: josephbmanley/build-godot-action@v1.4.0 with: - name: example + name: ChoukaBara preset: ${{ matrix.platform }} debugMode: "true" + projectDir: "./ChoukaBaraGame/" + subdirectory: ${{ matrix.platform }} + package: "true" - name: Upload Artifact uses: actions/upload-artifact@v2 with: - name: Client - ${{ matrix.platform }} + name: ${{ matrix.platform }} - Artifact path: ${{ github.workspace }}/${{ steps.build.outputs.build }} \ No newline at end of file From 2efa79f09618b3352e7905d7cc0dc1aff4ad6f7a Mon Sep 17 00:00:00 2001 From: mohithsrao Date: Sat, 26 Dec 2020 11:59:40 +0530 Subject: [PATCH 07/47] Updated build and added release task --- .github/workflows/build.yml | 30 +++++++++++++++++++++++++++--- .github/workflows/main.yml | 4 +--- ChoukaBaraGame/export_presets.cfg | 4 ++-- README.md | 5 +++++ 4 files changed, 35 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 41696d3..3e3a581 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,6 +14,7 @@ jobs: - uses: actions/checkout@v2 with: lfs: true + - name: Build id: build uses: josephbmanley/build-godot-action@v1.4.0 @@ -24,8 +25,31 @@ jobs: projectDir: "./ChoukaBaraGame/" subdirectory: ${{ matrix.platform }} package: "true" - - name: Upload Artifact + + - name: Upload Artifact to Build uses: actions/upload-artifact@v2 with: - name: ${{ matrix.platform }} - Artifact - path: ${{ github.workspace }}/${{ steps.build.outputs.build }} \ No newline at end of file + name: ${{ matrix.platform }} + path: ${{ github.workspace }}/${{ steps.build.outputs.build }} + + - name: Create Pre-Release + id: create_release + uses: actions/create-release@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + tag_name: ${{ github.ref }} + release_name: Release ${{ github.ref }} + draft: false + prerelease: true + + - name: Upload Pre-Release Asset + id: upload-release-asset + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_pre-release.outputs.upload_url }} + asset_path: ${{ steps.build.outputs.artifact }} + asset_name: ${{ matrix.platform }}.zip + asset_content_type: application/zip \ No newline at end of file diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fa5a46b..8b1aeb0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,6 +1,4 @@ -# This is a basic workflow to help you get started with Actions - -name: CI +name: Godot Project Export and Release # Controls when the action will run. Triggers the workflow on push or pull request # events but only for the master branch diff --git a/ChoukaBaraGame/export_presets.cfg b/ChoukaBaraGame/export_presets.cfg index 04233a1..dbfdf6b 100644 --- a/ChoukaBaraGame/export_presets.cfg +++ b/ChoukaBaraGame/export_presets.cfg @@ -7,7 +7,7 @@ custom_features="" export_filter="all_resources" include_filter="" exclude_filter="" -export_path="../Bin/WindowsDesktop/ChoukaBara.exe" +export_path="bin/WindowsDesktop/ChoukaBara.exe" patch_list=PoolStringArray( ) script_export_mode=1 script_encryption_key="" @@ -50,7 +50,7 @@ custom_features="" export_filter="all_resources" include_filter="" exclude_filter="" -export_path="../Bin/HTML/ChoukaBara.html" +export_path="bin/HTML/ChoukaBara.html" patch_list=PoolStringArray( ) script_export_mode=1 script_encryption_key="" diff --git a/README.md b/README.md index 8564077..4fe9c26 100644 --- a/README.md +++ b/README.md @@ -18,3 +18,8 @@ Reference Game Assets http://untamed.wild-refuge.net/rmxpresources.php?characters https://kenney.nl/assets/platformer-characters https://kenney.nl/assets/toon-characters-1 + +Used GitHub Actions + To Build Godot: https://github.com/marketplace/actions/build-godot + To Create Release: https://github.com/marketplace/actions/create-a-release + To Upload Artifacts to release: https://github.com/actions/upload-release-asset \ No newline at end of file From 278ad3ea75be473d6f90a249a6f3b4eb85a34840 Mon Sep 17 00:00:00 2001 From: mohithsrao Date: Sat, 26 Dec 2020 12:54:11 +0530 Subject: [PATCH 08/47] Updated build actions --- .github/workflows/build.yml | 28 +++++++++++++++++++++++++--- README.md | 5 ++++- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3e3a581..d4faa18 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,16 +32,38 @@ jobs: name: ${{ matrix.platform }} path: ${{ github.workspace }}/${{ steps.build.outputs.build }} + - name: Extract release notes + id: extract-release-notes + uses: ffurrer2/extract-release-notes@v1 + + - name: Get Previous Release tag + id: previous-tag + uses: InsonusK/get-latest-release@v1.0.1 + with: + myToken: ${{ github.token }} + exclude_types: "draft" + view_top: 1 + + - name: Bump release version + id: bump-version + uses: christian-draeger/increment-semantic-version@1.0.2 + with: + current-version: ${{ steps.previous-tag.outputs.tag_name }} + version-fragment: 'bug' # Change here to Update release version in future Possible options are [ major | feature | bug | alpha | beta | rc ] version Format: major.feature.bug-alpha|beta|rc + - name: Create Pre-Release id: create_release uses: actions/create-release@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - tag_name: ${{ github.ref }} - release_name: Release ${{ github.ref }} + tag_name: ${{ steps.bump-version.outputs.next-version }} + release_name: Release ${{ steps.bump-version.outputs.next-version }} + body: | + Changes in this Release + ${{ steps.extract-release-notes.outputs.release_notes }} draft: false - prerelease: true + prerelease: true # Change here to make prerelease as the actual release - name: Upload Pre-Release Asset id: upload-release-asset diff --git a/README.md b/README.md index 4fe9c26..abedde7 100644 --- a/README.md +++ b/README.md @@ -22,4 +22,7 @@ Reference Game Assets Used GitHub Actions To Build Godot: https://github.com/marketplace/actions/build-godot To Create Release: https://github.com/marketplace/actions/create-a-release - To Upload Artifacts to release: https://github.com/actions/upload-release-asset \ No newline at end of file + To Upload Artifacts to release: https://github.com/actions/upload-release-asset + To extract Release Notes: https://github.com/ffurrer2/extract-release-notes + To get Previous Release Tag: https://github.com/marketplace/actions/get-latest-release-of-repository + To increase version number: https://github.com/marketplace/actions/increment-semantic-version \ No newline at end of file From 0bfcdae4a7d6fa7184a2fcb9ccc6822f46ed4271 Mon Sep 17 00:00:00 2001 From: mohithsrao Date: Sat, 26 Dec 2020 14:49:42 +0530 Subject: [PATCH 09/47] Cahnged release notes generation --- .github/workflows/build.yml | 6 +++--- README.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d4faa18..6241d9b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,9 +32,9 @@ jobs: name: ${{ matrix.platform }} path: ${{ github.workspace }}/${{ steps.build.outputs.build }} - - name: Extract release notes + - name: Extract Change Logs id: extract-release-notes - uses: ffurrer2/extract-release-notes@v1 + uses: heinrichreimer/github-changelog-generator-action@v2.1.1 - name: Get Previous Release tag id: previous-tag @@ -61,7 +61,7 @@ jobs: release_name: Release ${{ steps.bump-version.outputs.next-version }} body: | Changes in this Release - ${{ steps.extract-release-notes.outputs.release_notes }} + ${{ steps.extract-release-notes.outputs.changelog }} draft: false prerelease: true # Change here to make prerelease as the actual release diff --git a/README.md b/README.md index abedde7..ccfa918 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,6 @@ Used GitHub Actions To Build Godot: https://github.com/marketplace/actions/build-godot To Create Release: https://github.com/marketplace/actions/create-a-release To Upload Artifacts to release: https://github.com/actions/upload-release-asset - To extract Release Notes: https://github.com/ffurrer2/extract-release-notes + To get change Log: https://github.com/marketplace/actions/generate-changelog To get Previous Release Tag: https://github.com/marketplace/actions/get-latest-release-of-repository To increase version number: https://github.com/marketplace/actions/increment-semantic-version \ No newline at end of file From f61a7f97e2670fda04115eb745be391f8c36fb85 Mon Sep 17 00:00:00 2001 From: mohithsrao Date: Sat, 26 Dec 2020 15:18:06 +0530 Subject: [PATCH 10/47] formated the tag as required --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6241d9b..cdafee2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -48,7 +48,7 @@ jobs: id: bump-version uses: christian-draeger/increment-semantic-version@1.0.2 with: - current-version: ${{ steps.previous-tag.outputs.tag_name }} + current-version: ${{ steps.previous-tag.outputs.tag_name }} | cut -d'v' -f 2 version-fragment: 'bug' # Change here to Update release version in future Possible options are [ major | feature | bug | alpha | beta | rc ] version Format: major.feature.bug-alpha|beta|rc - name: Create Pre-Release From ab3003aa2f7be793c7b7e5f66a63c98df687361b Mon Sep 17 00:00:00 2001 From: mohithsrao Date: Sat, 26 Dec 2020 15:31:11 +0530 Subject: [PATCH 11/47] made formating into saparate step --- .github/workflows/build.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cdafee2..d55f2f7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - platform: [ChoukaBara-Windows, ChoukaBara-HTML5] + platform: [ChoukaBara-Windows] #, ChoukaBara-HTML5 steps: - uses: actions/checkout@v2 with: @@ -44,11 +44,17 @@ jobs: exclude_types: "draft" view_top: 1 + - name: Format Tag Name + id: formated-release-tag + runs: formatedTag = "${{ steps.previous-tag.outputs.tag_name }}" | cut -d'v' -f 2 + env: + formated-tag: $formatedTag + - name: Bump release version id: bump-version uses: christian-draeger/increment-semantic-version@1.0.2 with: - current-version: ${{ steps.previous-tag.outputs.tag_name }} | cut -d'v' -f 2 + current-version: ${{ env.formated-tag }} version-fragment: 'bug' # Change here to Update release version in future Possible options are [ major | feature | bug | alpha | beta | rc ] version Format: major.feature.bug-alpha|beta|rc - name: Create Pre-Release From f970aea090bcd767579b62c94d1787c66e5c13aa Mon Sep 17 00:00:00 2001 From: mohithsrao Date: Sat, 26 Dec 2020 15:32:22 +0530 Subject: [PATCH 12/47] corrected run task --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d55f2f7..89218e4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -46,7 +46,7 @@ jobs: - name: Format Tag Name id: formated-release-tag - runs: formatedTag = "${{ steps.previous-tag.outputs.tag_name }}" | cut -d'v' -f 2 + run: formatedTag = "${{ steps.previous-tag.outputs.tag_name }}" | cut -d'v' -f 2 env: formated-tag: $formatedTag From 43fd273784f35e4d44d7063858ea83301b637b6f Mon Sep 17 00:00:00 2001 From: mohithsrao Date: Sat, 26 Dec 2020 15:47:11 +0530 Subject: [PATCH 13/47] Updated set variable for output --- .github/workflows/build.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 89218e4..53cd5bb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -46,15 +46,14 @@ jobs: - name: Format Tag Name id: formated-release-tag - run: formatedTag = "${{ steps.previous-tag.outputs.tag_name }}" | cut -d'v' -f 2 - env: - formated-tag: $formatedTag - + run: | + echo ::set-output name=formated-tag::$(echo ${{ steps.previous-tag.outputs.tag_name }} | cut -d'v' -f 2) + - name: Bump release version id: bump-version uses: christian-draeger/increment-semantic-version@1.0.2 with: - current-version: ${{ env.formated-tag }} + current-version: ${{ steps.formated-release-tag.outputs.formated-tag }} version-fragment: 'bug' # Change here to Update release version in future Possible options are [ major | feature | bug | alpha | beta | rc ] version Format: major.feature.bug-alpha|beta|rc - name: Create Pre-Release From 28cf5a36cbe2f37f53bdde107f7aa89b7fb3c09e Mon Sep 17 00:00:00 2001 From: mohithsrao Date: Sat, 26 Dec 2020 16:03:04 +0530 Subject: [PATCH 14/47] corrected variable --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 53cd5bb..6862003 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -76,7 +76,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - upload_url: ${{ steps.create_pre-release.outputs.upload_url }} + upload_url: ${{ steps.create_release.outputs.upload_url }} asset_path: ${{ steps.build.outputs.artifact }} asset_name: ${{ matrix.platform }}.zip asset_content_type: application/zip \ No newline at end of file From e6aa09847c4a3b5c0b2ee897992e69da35a5fbe4 Mon Sep 17 00:00:00 2001 From: mohithsrao Date: Sat, 26 Dec 2020 16:19:12 +0530 Subject: [PATCH 15/47] Added params for getting additional change logs --- .github/workflows/build.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6862003..90275a4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,7 +35,16 @@ jobs: - name: Extract Change Logs id: extract-release-notes uses: heinrichreimer/github-changelog-generator-action@v2.1.1 - + with: + token: ${{ secrets.GITHUB_TOKEN }} + issues: true + issuesWoLabels: true + pullRequests: true + prWoLabels: true + filterByMilestone: true + author: true + unreleased: true # make false when releasing in future + - name: Get Previous Release tag id: previous-tag uses: InsonusK/get-latest-release@v1.0.1 @@ -62,7 +71,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - tag_name: ${{ steps.bump-version.outputs.next-version }} + tag_name: v${{ steps.bump-version.outputs.next-version }} release_name: Release ${{ steps.bump-version.outputs.next-version }} body: | Changes in this Release From d3db0070e7c58bd82d7df845a753d6b3c60e10ad Mon Sep 17 00:00:00 2001 From: mohithsrao Date: Sat, 26 Dec 2020 16:20:33 +0530 Subject: [PATCH 16/47] Corrected syntax --- .github/workflows/build.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 90275a4..c8d753b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,15 +35,15 @@ jobs: - name: Extract Change Logs id: extract-release-notes uses: heinrichreimer/github-changelog-generator-action@v2.1.1 - with: - token: ${{ secrets.GITHUB_TOKEN }} - issues: true - issuesWoLabels: true - pullRequests: true - prWoLabels: true - filterByMilestone: true - author: true - unreleased: true # make false when releasing in future + with: + token: ${{ secrets.GITHUB_TOKEN }} + issues: true + issuesWoLabels: true + pullRequests: true + prWoLabels: true + filterByMilestone: true + author: true + unreleased: true # make false when releasing in future - name: Get Previous Release tag id: previous-tag From 781524d55538c9808891f48cbcbe29cfd01270cd Mon Sep 17 00:00:00 2001 From: mohithsrao Date: Sat, 26 Dec 2020 16:41:54 +0530 Subject: [PATCH 17/47] Included html files to build --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c8d753b..325d562 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - platform: [ChoukaBara-Windows] #, ChoukaBara-HTML5 + platform: [ChoukaBara-Windows, ChoukaBara-HTML5] steps: - uses: actions/checkout@v2 with: From 2e47aab43f177b2a6de9b326c12e9dbc1776902e Mon Sep 17 00:00:00 2001 From: mohithsrao Date: Sat, 26 Dec 2020 17:40:51 +0530 Subject: [PATCH 18/47] saparated build and release jobs --- .github/workflows/build.yml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 325d562..085fbb0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,6 +10,7 @@ jobs: strategy: matrix: platform: [ChoukaBara-Windows, ChoukaBara-HTML5] + steps: - uses: actions/checkout@v2 with: @@ -31,7 +32,11 @@ jobs: with: name: ${{ matrix.platform }} path: ${{ github.workspace }}/${{ steps.build.outputs.build }} - + + Release: + runs-on: ubuntu-latest + needs: Godot + steps: - name: Extract Change Logs id: extract-release-notes uses: heinrichreimer/github-changelog-generator-action@v2.1.1 @@ -79,6 +84,13 @@ jobs: draft: false prerelease: true # Change here to make prerelease as the actual release + - name: Download Build Artifacts + id: downloaded-artifacts + uses: actions/download-artifact@v2 + with: + name: chouka-bara-artifacts + path: ~/artifacts + - name: Upload Pre-Release Asset id: upload-release-asset uses: actions/upload-release-asset@v1 @@ -86,6 +98,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ${{ steps.build.outputs.artifact }} - asset_name: ${{ matrix.platform }}.zip + asset_path: ${{steps.downloaded-artifacts.outputs.download-path}} + asset_name: chouka-bara.zip asset_content_type: application/zip \ No newline at end of file From 134335751c481335ef2cd5b841a0f690a1cbf467 Mon Sep 17 00:00:00 2001 From: mohithsrao Date: Sat, 26 Dec 2020 17:56:32 +0530 Subject: [PATCH 19/47] Corrected artifacts for release --- .github/workflows/build.yml | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 085fbb0..0e056d6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -70,6 +70,20 @@ jobs: current-version: ${{ steps.formated-release-tag.outputs.formated-tag }} version-fragment: 'bug' # Change here to Update release version in future Possible options are [ major | feature | bug | alpha | beta | rc ] version Format: major.feature.bug-alpha|beta|rc + - name: Download HTML Build Artifacts + id: downloaded-artifacts + uses: actions/download-artifact@v2 + with: + name: ChoukaBara-HTML5 + path: ~/artifacts/html + + - name: Download Windows Build Artifacts + id: downloaded-artifacts + uses: actions/download-artifact@v2 + with: + name: ChoukaBara-Windows + path: ~/artifacts/windows + - name: Create Pre-Release id: create_release uses: actions/create-release@v1 @@ -84,13 +98,6 @@ jobs: draft: false prerelease: true # Change here to make prerelease as the actual release - - name: Download Build Artifacts - id: downloaded-artifacts - uses: actions/download-artifact@v2 - with: - name: chouka-bara-artifacts - path: ~/artifacts - - name: Upload Pre-Release Asset id: upload-release-asset uses: actions/upload-release-asset@v1 @@ -98,6 +105,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ${{steps.downloaded-artifacts.outputs.download-path}} + asset_path: ~/artifacts/ asset_name: chouka-bara.zip asset_content_type: application/zip \ No newline at end of file From 03de2ce8ee89b41f6059110ff6f6fe155dc3996a Mon Sep 17 00:00:00 2001 From: mohithsrao Date: Sat, 26 Dec 2020 18:01:03 +0530 Subject: [PATCH 20/47] Updated release artifacts paths --- .github/workflows/build.yml | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0e056d6..986f24d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -71,14 +71,14 @@ jobs: version-fragment: 'bug' # Change here to Update release version in future Possible options are [ major | feature | bug | alpha | beta | rc ] version Format: major.feature.bug-alpha|beta|rc - name: Download HTML Build Artifacts - id: downloaded-artifacts + id: downloaded-html-artifacts uses: actions/download-artifact@v2 with: name: ChoukaBara-HTML5 path: ~/artifacts/html - name: Download Windows Build Artifacts - id: downloaded-artifacts + id: downloaded-windows-artifacts uses: actions/download-artifact@v2 with: name: ChoukaBara-Windows @@ -98,13 +98,24 @@ jobs: draft: false prerelease: true # Change here to make prerelease as the actual release - - name: Upload Pre-Release Asset - id: upload-release-asset + - name: Upload Pre-Release Windows Asset + id: upload-windows-release-asset uses: actions/upload-release-asset@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ~/artifacts/ - asset_name: chouka-bara.zip + asset_path: ${{ ${{steps.downloaded-windows-artifacts.outputs.download-path}} }} + asset_name: chouka-bara-windows.zip + asset_content_type: application/zip + + - name: Upload Pre-Release HTML5 Asset + id: upload-html-release-asset + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: ${{ ${{steps.downloaded-html-artifacts.outputs.download-path}} }} + asset_name: chouka-bara-html.zip asset_content_type: application/zip \ No newline at end of file From f28f44150987962253625e3a76c0d599a891126a Mon Sep 17 00:00:00 2001 From: mohithsrao Date: Sat, 26 Dec 2020 18:02:37 +0530 Subject: [PATCH 21/47] corrected yml syntax --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 986f24d..e329101 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -105,7 +105,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ${{ ${{steps.downloaded-windows-artifacts.outputs.download-path}} }} + asset_path: ${{ steps.downloaded-windows-artifacts.outputs.download-path}} asset_name: chouka-bara-windows.zip asset_content_type: application/zip @@ -116,6 +116,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ${{ ${{steps.downloaded-html-artifacts.outputs.download-path}} }} + asset_path: ${{ steps.downloaded-html-artifacts.outputs.download-path }} asset_name: chouka-bara-html.zip asset_content_type: application/zip \ No newline at end of file From 7e19e11fb12b4c72525302bba87b72b66b3d3108 Mon Sep 17 00:00:00 2001 From: mohithsrao Date: Sat, 26 Dec 2020 18:12:26 +0530 Subject: [PATCH 22/47] corrected artifact name --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e329101..d6858b0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -105,7 +105,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ${{ steps.downloaded-windows-artifacts.outputs.download-path}} + asset_path: ${{ steps.downloaded-windows-artifacts.outputs.download-path }}/ChoukaBara-Windows asset_name: chouka-bara-windows.zip asset_content_type: application/zip @@ -116,6 +116,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ${{ steps.downloaded-html-artifacts.outputs.download-path }} + asset_path: ${{ steps.downloaded-html-artifacts.outputs.download-path }}/ChoukaBara-HTML5 asset_name: chouka-bara-html.zip asset_content_type: application/zip \ No newline at end of file From fb2ff82f697f7a8bc52768dbe4f33162a71f5434 Mon Sep 17 00:00:00 2001 From: mohithsrao Date: Sat, 26 Dec 2020 18:16:28 +0530 Subject: [PATCH 23/47] Added zip files --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d6858b0..90a3c62 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -105,7 +105,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ${{ steps.downloaded-windows-artifacts.outputs.download-path }}/ChoukaBara-Windows + asset_path: ${{ steps.downloaded-windows-artifacts.outputs.download-path }}/ChoukaBara-Windows.zip asset_name: chouka-bara-windows.zip asset_content_type: application/zip @@ -116,6 +116,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ${{ steps.downloaded-html-artifacts.outputs.download-path }}/ChoukaBara-HTML5 + asset_path: ${{ steps.downloaded-html-artifacts.outputs.download-path }}/ChoukaBara-HTML5.zip asset_name: chouka-bara-html.zip asset_content_type: application/zip \ No newline at end of file From 4ea4a1eaa8b1c6d459cbe720fc65bc7a630d0bca Mon Sep 17 00:00:00 2001 From: mohithsrao Date: Sat, 26 Dec 2020 18:39:41 +0530 Subject: [PATCH 24/47] removed extra path folder --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 90a3c62..79009fc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,7 +25,7 @@ jobs: debugMode: "true" projectDir: "./ChoukaBaraGame/" subdirectory: ${{ matrix.platform }} - package: "true" + package: true - name: Upload Artifact to Build uses: actions/upload-artifact@v2 @@ -105,7 +105,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ${{ steps.downloaded-windows-artifacts.outputs.download-path }}/ChoukaBara-Windows.zip + asset_path: ${{ steps.downloaded-windows-artifacts.outputs.download-path }} asset_name: chouka-bara-windows.zip asset_content_type: application/zip @@ -116,6 +116,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ${{ steps.downloaded-html-artifacts.outputs.download-path }}/ChoukaBara-HTML5.zip + asset_path: ${{ steps.downloaded-html-artifacts.outputs.download-path }} asset_name: chouka-bara-html.zip asset_content_type: application/zip \ No newline at end of file From 267c334b38fdd6f251507b2b9cc594f97dede91e Mon Sep 17 00:00:00 2001 From: mohithsrao Date: Sat, 26 Dec 2020 18:50:00 +0530 Subject: [PATCH 25/47] changed the artifacts to tar's instead of direct files --- .github/workflows/build.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 79009fc..687a807 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,11 +27,14 @@ jobs: subdirectory: ${{ matrix.platform }} package: true + - name: 'Create Tar files' + run: tar -cvf ${{ matrix.platform }}.tar ${{ github.workspace }}/${{ steps.build.outputs.build }}/tar + - name: Upload Artifact to Build uses: actions/upload-artifact@v2 with: name: ${{ matrix.platform }} - path: ${{ github.workspace }}/${{ steps.build.outputs.build }} + path: ${{ github.workspace }}/${{ steps.build.outputs.build }}/tar Release: runs-on: ubuntu-latest @@ -74,14 +77,14 @@ jobs: id: downloaded-html-artifacts uses: actions/download-artifact@v2 with: - name: ChoukaBara-HTML5 + name: ChoukaBara-HTML5.tar path: ~/artifacts/html - name: Download Windows Build Artifacts id: downloaded-windows-artifacts uses: actions/download-artifact@v2 with: - name: ChoukaBara-Windows + name: ChoukaBara-Windows.tar path: ~/artifacts/windows - name: Create Pre-Release @@ -106,7 +109,7 @@ jobs: with: upload_url: ${{ steps.create_release.outputs.upload_url }} asset_path: ${{ steps.downloaded-windows-artifacts.outputs.download-path }} - asset_name: chouka-bara-windows.zip + asset_name: chouka-bara-windows.tar asset_content_type: application/zip - name: Upload Pre-Release HTML5 Asset @@ -117,5 +120,5 @@ jobs: with: upload_url: ${{ steps.create_release.outputs.upload_url }} asset_path: ${{ steps.downloaded-html-artifacts.outputs.download-path }} - asset_name: chouka-bara-html.zip + asset_name: chouka-bara-html.tar asset_content_type: application/zip \ No newline at end of file From 0fd9a75e60190c0e50a0bdefe5409324b194b43f Mon Sep 17 00:00:00 2001 From: mohithsrao Date: Sat, 26 Dec 2020 18:52:23 +0530 Subject: [PATCH 26/47] corrected path for upload --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 687a807..ecc29f8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,13 +28,13 @@ jobs: package: true - name: 'Create Tar files' - run: tar -cvf ${{ matrix.platform }}.tar ${{ github.workspace }}/${{ steps.build.outputs.build }}/tar + run: tar -cvf ${{ matrix.platform }}.tar ${{ github.workspace }}/${{ steps.build.outputs.build }}tar - name: Upload Artifact to Build uses: actions/upload-artifact@v2 with: name: ${{ matrix.platform }} - path: ${{ github.workspace }}/${{ steps.build.outputs.build }}/tar + path: ${{ github.workspace }}/${{ steps.build.outputs.build }}tar Release: runs-on: ubuntu-latest From ccdc833fd41fcc932e3cff4457e66f9405772312 Mon Sep 17 00:00:00 2001 From: mohithsrao Date: Sat, 26 Dec 2020 18:55:45 +0530 Subject: [PATCH 27/47] corrected tar path --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ecc29f8..d6743ee 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,13 +28,13 @@ jobs: package: true - name: 'Create Tar files' - run: tar -cvf ${{ matrix.platform }}.tar ${{ github.workspace }}/${{ steps.build.outputs.build }}tar + run: tar -cvf ${{ matrix.platform }}.tar ${{ github.workspace }}/${{ steps.build.outputs.build }} - name: Upload Artifact to Build uses: actions/upload-artifact@v2 with: name: ${{ matrix.platform }} - path: ${{ github.workspace }}/${{ steps.build.outputs.build }}tar + path: ${{ github.workspace }}/${{ steps.build.outputs.build }}${{ matrix.platform }}.tar Release: runs-on: ubuntu-latest From 332327ecb417ee70c9b2808d2d2ec42806982a8f Mon Sep 17 00:00:00 2001 From: mohithsrao Date: Sat, 26 Dec 2020 19:02:48 +0530 Subject: [PATCH 28/47] corrected tar path --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d6743ee..bfb35ed 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,7 +28,7 @@ jobs: package: true - name: 'Create Tar files' - run: tar -cvf ${{ matrix.platform }}.tar ${{ github.workspace }}/${{ steps.build.outputs.build }} + run: tar -cvf ${{ github.workspace }}/${{ steps.build.outputs.build }}${{ matrix.platform }}.tar ${{ github.workspace }}/${{ steps.build.outputs.build }} - name: Upload Artifact to Build uses: actions/upload-artifact@v2 From 39615d8fe628aecc8109747998ffc352c3708332 Mon Sep 17 00:00:00 2001 From: mohithsrao Date: Sat, 26 Dec 2020 19:16:22 +0530 Subject: [PATCH 29/47] removed unnecessary path for tar file --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bfb35ed..5a88bac 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,13 +28,13 @@ jobs: package: true - name: 'Create Tar files' - run: tar -cvf ${{ github.workspace }}/${{ steps.build.outputs.build }}${{ matrix.platform }}.tar ${{ github.workspace }}/${{ steps.build.outputs.build }} + run: tar -cvf ${{ matrix.platform }}.tar ${{ github.workspace }}/${{ steps.build.outputs.build }} - name: Upload Artifact to Build uses: actions/upload-artifact@v2 with: name: ${{ matrix.platform }} - path: ${{ github.workspace }}/${{ steps.build.outputs.build }}${{ matrix.platform }}.tar + path: ${{ matrix.platform }}.tar Release: runs-on: ubuntu-latest From 0eba5bd37ced52b222fa4153a2b98d4117e0b72d Mon Sep 17 00:00:00 2001 From: mohithsrao Date: Sat, 26 Dec 2020 19:39:44 +0530 Subject: [PATCH 30/47] corrected artifact name while uploading. --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5a88bac..656eb41 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,7 +33,7 @@ jobs: - name: Upload Artifact to Build uses: actions/upload-artifact@v2 with: - name: ${{ matrix.platform }} + name: ${{ matrix.platform }}.tar path: ${{ matrix.platform }}.tar Release: From 633f131437829b450fbf5e73548d5a5c013300f0 Mon Sep 17 00:00:00 2001 From: mohithsrao Date: Sat, 26 Dec 2020 19:46:19 +0530 Subject: [PATCH 31/47] asset path correction --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 656eb41..0f59ca4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -108,7 +108,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ${{ steps.downloaded-windows-artifacts.outputs.download-path }} + asset_path: ${{ steps.downloaded-windows-artifacts.outputs.download-path }}/ChoukaBara-Windows.tar asset_name: chouka-bara-windows.tar asset_content_type: application/zip @@ -119,6 +119,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ${{ steps.downloaded-html-artifacts.outputs.download-path }} + asset_path: ${{ steps.downloaded-html-artifacts.outputs.download-path }}/ChoukaBara-HTML5.tar asset_name: chouka-bara-html.tar asset_content_type: application/zip \ No newline at end of file From f22f1d1f231182e43b2f1ce9df0a6072188cc4a8 Mon Sep 17 00:00:00 2001 From: mohithsrao Date: Sat, 26 Dec 2020 20:40:42 +0530 Subject: [PATCH 32/47] Updated main release with updated changes --- .github/workflows/build.yml | 9 +- .github/workflows/main.yml | 192 +++++++++++++++++++++++++++--------- 2 files changed, 152 insertions(+), 49 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0f59ca4..c2046d9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,7 +1,6 @@ name: Build Godot Project on: - push: {} # Runs on all Push pull_request: {} # Runs on all Pull-Request jobs: @@ -16,7 +15,7 @@ jobs: with: lfs: true - - name: Build + - name: Build ${{ matrix.platform }} id: build uses: josephbmanley/build-godot-action@v1.4.0 with: @@ -88,7 +87,7 @@ jobs: path: ~/artifacts/windows - name: Create Pre-Release - id: create_release + id: create-release uses: actions/create-release@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -107,7 +106,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - upload_url: ${{ steps.create_release.outputs.upload_url }} + upload_url: ${{ steps.create-release.outputs.upload_url }} asset_path: ${{ steps.downloaded-windows-artifacts.outputs.download-path }}/ChoukaBara-Windows.tar asset_name: chouka-bara-windows.tar asset_content_type: application/zip @@ -118,7 +117,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - upload_url: ${{ steps.create_release.outputs.upload_url }} + upload_url: ${{ steps.create-release.outputs.upload_url }} asset_path: ${{ steps.downloaded-html-artifacts.outputs.download-path }}/ChoukaBara-HTML5.tar asset_name: chouka-bara-html.tar asset_content_type: application/zip \ No newline at end of file diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8b1aeb0..06d67a7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -6,49 +6,153 @@ on: push: branches: [ master ] -# A workflow run is made up of one or more jobs that can run sequentially or in parallel +env: + GODOT_VERSION: 3.2.3 + EXPORT_NAME: Chouka-Bara + jobs: - # This workflow contains a single job called "build" - build: - name: Build on Node ${{ matrix.os }} - # The type of runner that the job will run on - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-latest] - env: - working-directory: godotHtml - - # Steps represent a sequence of tasks that will be executed as part of the job + export-windows: + name: Windows Export + runs-on: ubuntu-latest + container: + image: barichello/godot-ci:3.2.3 + steps: + - name: Checkout + uses: actions/checkout@v2 + with: + lfs: true + - name: Setup + run: | + mkdir -v -p ~/.local/share/godot/templates + mv /root/.local/share/godot/templates/${GODOT_VERSION}.stable ~/.local/share/godot/templates/${GODOT_VERSION}.stable + - name: Windows Build + run: | + mkdir -v -p build/windows + cd $EXPORT_NAME + godot -v --export "Windows Desktop" ../build/windows/$EXPORT_NAME.exe + - name: Upload Artifact + uses: actions/upload-artifact@v1 + with: + name: windows.zip + path: build/windows + + export-web: + name: Web Export + runs-on: ubuntu-latest + container: + image: barichello/godot-ci:3.2.3 steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - - name: Godot Export - uses: firebelley/godot-export@v2.4.0 - with: - godot_executable_download_url: https://downloads.tuxfamily.org/godotengine/3.2.2/Godot_v3.2.2-stable_linux_headless.64.zip - godot_export_templates_download_url: https://downloads.tuxfamily.org/godotengine/3.2.2/Godot_v3.2.2-stable_export_templates.tpz - relative_project_path: ./ChoukaBaraGame/ - generate_release_notes: true - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Create Build Directory - run: | - mkdir ${{ env.working-directory }} - cd "/home/runner/.local/share/godot/builds/ChoukaBara-HTML5" - cp -v * /home/runner/work/GodotGameChoukaBara/GodotGameChoukaBara/${{ env.working-directory }} - cd - - mv ${{ env.working-directory }}/ChoukaBara.html ${{ env.working-directory }}/index.html - - - name: Deploy Game HTML5 Site - if: success() - uses: crazy-max/ghaction-github-pages@v2 - with: - target_branch: gh-pages - build_dir: ${{ env.working-directory }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Checkout + uses: actions/checkout@v2 + with: + lfs: true + - name: Setup + run: | + mkdir -v -p ~/.local/share/godot/templates + mv /root/.local/share/godot/templates/${GODOT_VERSION}.stable ~/.local/share/godot/templates/${GODOT_VERSION}.stable + - name: Web Build + run: | + mkdir -v -p build/web + cd $EXPORT_NAME + godot -v --export "HTML5" ../build/web/index.html + - name: Upload Artifact + uses: actions/upload-artifact@v1 + with: + name: web.zip + path: build/web + # Installing rsync is needed in order to deploy to GitHub Pages. Without it, the build will fail. + - name: Install rsync + run: | + apt-get update && apt-get install -y rsync + - name: Deploy to GitHub Pages + uses: JamesIves/github-pages-deploy-action@releases/v3 + with: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + BRANCH: gh-pages # The branch the action should deploy to. + FOLDER: build/web # The folder the action should deploy. + + Release: + runs-on: ubuntu-latest + needs: [export-windows,export-web] + steps: + - name: Extract Change Logs + id: extract-release-notes + uses: heinrichreimer/github-changelog-generator-action@v2.1.1 + with: + token: ${{ secrets.GITHUB_TOKEN }} + issues: true + issuesWoLabels: true + pullRequests: true + prWoLabels: true + filterByMilestone: true + author: true + + - name: Get Previous Release tag + id: previous-tag + uses: InsonusK/get-latest-release@v1.0.1 + with: + myToken: ${{ github.token }} + exclude_types: "draft" + view_top: 1 + + - name: Format Tag Name + id: formated-release-tag + run: | + echo ::set-output name=formated-tag::$(echo ${{ steps.previous-tag.outputs.tag_name }} | cut -d'v' -f 2) + + - name: Bump release version + id: bump-version + uses: christian-draeger/increment-semantic-version@1.0.2 + with: + current-version: ${{ steps.formated-release-tag.outputs.formated-tag }} + version-fragment: 'feature' # Change here to Update release version in future Possible options are [ major | feature | bug | alpha | beta | rc ] version Format: major.feature.bug-alpha|beta|rc + + - name: Download HTML Build Artifacts + id: downloaded-html-artifacts + uses: actions/download-artifact@v2 + with: + name: web.zip + path: ~/artifacts/html + + - name: Download Windows Build Artifacts + id: downloaded-windows-artifacts + uses: actions/download-artifact@v2 + with: + name: windows.zip + path: ~/artifacts/windows + + - name: Create Release + id: create-release + uses: actions/create-release@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + tag_name: v${{ steps.bump-version.outputs.next-version }} + release_name: Release ${{ steps.bump-version.outputs.next-version }} + body: | + Changes in this Release + ${{ steps.extract-release-notes.outputs.changelog }} + draft: false + prerelease: false + + - name: Upload Pre-Release Windows Asset + id: upload-windows-release-asset + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create-release.outputs.upload_url }} + asset_path: ${{ steps.downloaded-windows-artifacts.outputs.download-path }}/windows.zip + asset_name: chouka-bara-windows.zip + asset_content_type: application/zip + + - name: Upload Pre-Release HTML5 Asset + id: upload-html-release-asset + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create-release.outputs.upload_url }} + asset_path: ${{ steps.downloaded-html-artifacts.outputs.download-path }}/web.zip + asset_name: chouka-bara-html.zip + asset_content_type: application/zip \ No newline at end of file From f784ac0aca5faaa4c6023983caa836be318469df Mon Sep 17 00:00:00 2001 From: mohithsrao Date: Sat, 26 Dec 2020 21:24:57 +0530 Subject: [PATCH 33/47] Updated Build path --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 06d67a7..97494fd 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,7 +27,7 @@ jobs: mv /root/.local/share/godot/templates/${GODOT_VERSION}.stable ~/.local/share/godot/templates/${GODOT_VERSION}.stable - name: Windows Build run: | - mkdir -v -p build/windows + mkdir -v -p build/windows/$EXPORT_NAME cd $EXPORT_NAME godot -v --export "Windows Desktop" ../build/windows/$EXPORT_NAME.exe - name: Upload Artifact @@ -52,7 +52,7 @@ jobs: mv /root/.local/share/godot/templates/${GODOT_VERSION}.stable ~/.local/share/godot/templates/${GODOT_VERSION}.stable - name: Web Build run: | - mkdir -v -p build/web + mkdir -v -p build/web/$EXPORT_NAME cd $EXPORT_NAME godot -v --export "HTML5" ../build/web/index.html - name: Upload Artifact From bc3ad29364735fc6d2842bd2b7255b782e20f141 Mon Sep 17 00:00:00 2001 From: mohithsrao Date: Sat, 26 Dec 2020 21:36:01 +0530 Subject: [PATCH 34/47] Updated path for build --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 97494fd..4bb32f5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -28,7 +28,7 @@ jobs: - name: Windows Build run: | mkdir -v -p build/windows/$EXPORT_NAME - cd $EXPORT_NAME + cd build/windows/$EXPORT_NAME godot -v --export "Windows Desktop" ../build/windows/$EXPORT_NAME.exe - name: Upload Artifact uses: actions/upload-artifact@v1 @@ -53,7 +53,7 @@ jobs: - name: Web Build run: | mkdir -v -p build/web/$EXPORT_NAME - cd $EXPORT_NAME + cd build/web/$EXPORT_NAME godot -v --export "HTML5" ../build/web/index.html - name: Upload Artifact uses: actions/upload-artifact@v1 From 02ceeaff411675bc7bbe8b3ac903d526423dd3c1 Mon Sep 17 00:00:00 2001 From: mohithsrao Date: Sat, 26 Dec 2020 21:57:23 +0530 Subject: [PATCH 35/47] updated export preset names --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4bb32f5..f394427 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,7 +29,7 @@ jobs: run: | mkdir -v -p build/windows/$EXPORT_NAME cd build/windows/$EXPORT_NAME - godot -v --export "Windows Desktop" ../build/windows/$EXPORT_NAME.exe + godot -v --export "ChoukaBara-Windows" ../build/windows/$EXPORT_NAME.exe - name: Upload Artifact uses: actions/upload-artifact@v1 with: @@ -54,7 +54,7 @@ jobs: run: | mkdir -v -p build/web/$EXPORT_NAME cd build/web/$EXPORT_NAME - godot -v --export "HTML5" ../build/web/index.html + godot -v --export "ChoukaBara-HTML5" ../build/web/index.html - name: Upload Artifact uses: actions/upload-artifact@v1 with: From 2efd64adec2fc2119251acf95df19a3b9ead170f Mon Sep 17 00:00:00 2001 From: mohithsrao Date: Sat, 26 Dec 2020 22:27:05 +0530 Subject: [PATCH 36/47] changed base directory --- .github/workflows/main.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f394427..75f7a5c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -46,6 +46,13 @@ jobs: uses: actions/checkout@v2 with: lfs: true + + - name: Change Base Directory + run: | + echo $(pwd) + cd ./ChoukaBaraGame + echo $(pwd) + - name: Setup run: | mkdir -v -p ~/.local/share/godot/templates From 3b020e1d1b2f1383fa695a0450523661e4723d9a Mon Sep 17 00:00:00 2001 From: mohithsrao Date: Sat, 26 Dec 2020 22:50:53 +0530 Subject: [PATCH 37/47] Removed change directory --- .github/workflows/main.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 75f7a5c..731ee7d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -21,6 +21,13 @@ jobs: uses: actions/checkout@v2 with: lfs: true + + - name: Change Base Directory + run: | + echo $(pwd) + cd ./ChoukaBaraGame + echo $(pwd) + - name: Setup run: | mkdir -v -p ~/.local/share/godot/templates @@ -28,7 +35,7 @@ jobs: - name: Windows Build run: | mkdir -v -p build/windows/$EXPORT_NAME - cd build/windows/$EXPORT_NAME + # cd build/windows/$EXPORT_NAME godot -v --export "ChoukaBara-Windows" ../build/windows/$EXPORT_NAME.exe - name: Upload Artifact uses: actions/upload-artifact@v1 @@ -60,7 +67,7 @@ jobs: - name: Web Build run: | mkdir -v -p build/web/$EXPORT_NAME - cd build/web/$EXPORT_NAME + # cd build/web/$EXPORT_NAME godot -v --export "ChoukaBara-HTML5" ../build/web/index.html - name: Upload Artifact uses: actions/upload-artifact@v1 From 6051b508d4c601b8ee5696fa5e0a8cce4795ab29 Mon Sep 17 00:00:00 2001 From: mohithsrao Date: Sat, 26 Dec 2020 22:55:55 +0530 Subject: [PATCH 38/47] fixed syntax --- .github/workflows/main.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 731ee7d..4d80473 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -35,7 +35,6 @@ jobs: - name: Windows Build run: | mkdir -v -p build/windows/$EXPORT_NAME - # cd build/windows/$EXPORT_NAME godot -v --export "ChoukaBara-Windows" ../build/windows/$EXPORT_NAME.exe - name: Upload Artifact uses: actions/upload-artifact@v1 @@ -67,7 +66,6 @@ jobs: - name: Web Build run: | mkdir -v -p build/web/$EXPORT_NAME - # cd build/web/$EXPORT_NAME godot -v --export "ChoukaBara-HTML5" ../build/web/index.html - name: Upload Artifact uses: actions/upload-artifact@v1 From 89afd0c7d561b43c2a2394708336f3dd99e22676 Mon Sep 17 00:00:00 2001 From: mohithsrao Date: Sat, 26 Dec 2020 23:04:58 +0530 Subject: [PATCH 39/47] changed ped location --- .github/workflows/main.yml | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4d80473..4d06721 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -22,12 +22,6 @@ jobs: with: lfs: true - - name: Change Base Directory - run: | - echo $(pwd) - cd ./ChoukaBaraGame - echo $(pwd) - - name: Setup run: | mkdir -v -p ~/.local/share/godot/templates @@ -35,6 +29,11 @@ jobs: - name: Windows Build run: | mkdir -v -p build/windows/$EXPORT_NAME + + echo $(pwd) + cd ./ChoukaBaraGame + echo $(pwd) + godot -v --export "ChoukaBara-Windows" ../build/windows/$EXPORT_NAME.exe - name: Upload Artifact uses: actions/upload-artifact@v1 @@ -53,12 +52,6 @@ jobs: with: lfs: true - - name: Change Base Directory - run: | - echo $(pwd) - cd ./ChoukaBaraGame - echo $(pwd) - - name: Setup run: | mkdir -v -p ~/.local/share/godot/templates @@ -66,6 +59,11 @@ jobs: - name: Web Build run: | mkdir -v -p build/web/$EXPORT_NAME + + echo $(pwd) + cd ./ChoukaBaraGame + echo $(pwd) + godot -v --export "ChoukaBara-HTML5" ../build/web/index.html - name: Upload Artifact uses: actions/upload-artifact@v1 From cd821b21e987429a2e75bc1e720ce095965df178 Mon Sep 17 00:00:00 2001 From: mohithsrao Date: Sat, 26 Dec 2020 23:33:37 +0530 Subject: [PATCH 40/47] changed tar's to zip files --- .github/workflows/build.yml | 20 ++++++++++---------- .github/workflows/main.yml | 10 ++++++++++ 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c2046d9..693eaeb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,14 +26,14 @@ jobs: subdirectory: ${{ matrix.platform }} package: true - - name: 'Create Tar files' - run: tar -cvf ${{ matrix.platform }}.tar ${{ github.workspace }}/${{ steps.build.outputs.build }} + - name: Create Tar files + run: tar -cvf ${{ matrix.platform }}.tgz ${{ github.workspace }}/${{ steps.build.outputs.build }} - name: Upload Artifact to Build uses: actions/upload-artifact@v2 with: - name: ${{ matrix.platform }}.tar - path: ${{ matrix.platform }}.tar + name: ${{ matrix.platform }}.tgz + path: ${{ matrix.platform }}.tgz Release: runs-on: ubuntu-latest @@ -76,14 +76,14 @@ jobs: id: downloaded-html-artifacts uses: actions/download-artifact@v2 with: - name: ChoukaBara-HTML5.tar + name: ChoukaBara-HTML5.tgz path: ~/artifacts/html - name: Download Windows Build Artifacts id: downloaded-windows-artifacts uses: actions/download-artifact@v2 with: - name: ChoukaBara-Windows.tar + name: ChoukaBara-Windows.tgz path: ~/artifacts/windows - name: Create Pre-Release @@ -107,8 +107,8 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create-release.outputs.upload_url }} - asset_path: ${{ steps.downloaded-windows-artifacts.outputs.download-path }}/ChoukaBara-Windows.tar - asset_name: chouka-bara-windows.tar + asset_path: ${{ steps.downloaded-windows-artifacts.outputs.download-path }}/ChoukaBara-Windows.tgz + asset_name: chouka-bara-windows.tgz asset_content_type: application/zip - name: Upload Pre-Release HTML5 Asset @@ -118,6 +118,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create-release.outputs.upload_url }} - asset_path: ${{ steps.downloaded-html-artifacts.outputs.download-path }}/ChoukaBara-HTML5.tar - asset_name: chouka-bara-html.tar + asset_path: ${{ steps.downloaded-html-artifacts.outputs.download-path }}/ChoukaBara-HTML5.tgz + asset_name: chouka-bara-html.tgz asset_content_type: application/zip \ No newline at end of file diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4d06721..0aa9888 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,6 +26,7 @@ jobs: run: | mkdir -v -p ~/.local/share/godot/templates mv /root/.local/share/godot/templates/${GODOT_VERSION}.stable ~/.local/share/godot/templates/${GODOT_VERSION}.stable + sudo apt install zip unzip - name: Windows Build run: | mkdir -v -p build/windows/$EXPORT_NAME @@ -35,6 +36,10 @@ jobs: echo $(pwd) godot -v --export "ChoukaBara-Windows" ../build/windows/$EXPORT_NAME.exe + + - name: Create Zip files + run: zip -r windows.zip ./build/windows/ + - name: Upload Artifact uses: actions/upload-artifact@v1 with: @@ -56,6 +61,7 @@ jobs: run: | mkdir -v -p ~/.local/share/godot/templates mv /root/.local/share/godot/templates/${GODOT_VERSION}.stable ~/.local/share/godot/templates/${GODOT_VERSION}.stable + sudo apt install zip unzip - name: Web Build run: | mkdir -v -p build/web/$EXPORT_NAME @@ -65,6 +71,10 @@ jobs: echo $(pwd) godot -v --export "ChoukaBara-HTML5" ../build/web/index.html + + - name: Create Tar files + run: zip -r web.zip ./build/web/ + - name: Upload Artifact uses: actions/upload-artifact@v1 with: From 29bc576a271c60145c4e5891740a204cfbb3fcb1 Mon Sep 17 00:00:00 2001 From: mohithsrao Date: Sat, 26 Dec 2020 23:37:13 +0530 Subject: [PATCH 41/47] Corrected task name to zip --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0aa9888..f9784be 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -72,7 +72,7 @@ jobs: godot -v --export "ChoukaBara-HTML5" ../build/web/index.html - - name: Create Tar files + - name: Create Zip files run: zip -r web.zip ./build/web/ - name: Upload Artifact From 090cb4001ffc111996545b776de52fe7d61aea54 Mon Sep 17 00:00:00 2001 From: mohithsrao Date: Sat, 26 Dec 2020 23:46:30 +0530 Subject: [PATCH 42/47] removed sudo --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f9784be..e3fa479 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,7 +26,7 @@ jobs: run: | mkdir -v -p ~/.local/share/godot/templates mv /root/.local/share/godot/templates/${GODOT_VERSION}.stable ~/.local/share/godot/templates/${GODOT_VERSION}.stable - sudo apt install zip unzip + apt-get install -y zip unzip - name: Windows Build run: | mkdir -v -p build/windows/$EXPORT_NAME @@ -61,7 +61,7 @@ jobs: run: | mkdir -v -p ~/.local/share/godot/templates mv /root/.local/share/godot/templates/${GODOT_VERSION}.stable ~/.local/share/godot/templates/${GODOT_VERSION}.stable - sudo apt install zip unzip + apt-get install -y zip unzip - name: Web Build run: | mkdir -v -p build/web/$EXPORT_NAME From 78e95ba8d922da33c932f98cee2cf664de6fb4b1 Mon Sep 17 00:00:00 2001 From: mohithsrao Date: Sat, 26 Dec 2020 23:59:06 +0530 Subject: [PATCH 43/47] changed zip path --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e3fa479..eaef7be 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -44,7 +44,7 @@ jobs: uses: actions/upload-artifact@v1 with: name: windows.zip - path: build/windows + path: windows.zip export-web: name: Web Export @@ -79,7 +79,7 @@ jobs: uses: actions/upload-artifact@v1 with: name: web.zip - path: build/web + path: web.zip # Installing rsync is needed in order to deploy to GitHub Pages. Without it, the build will fail. - name: Install rsync run: | From 863c35d8a3b40f796104a8d096486714f6771860 Mon Sep 17 00:00:00 2001 From: mohithsrao Date: Sun, 27 Dec 2020 11:00:01 +0530 Subject: [PATCH 44/47] Updated badge and redirecting changelog.md file to release Body --- .github/workflows/build.yml | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 693eaeb..82ff9bb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -96,7 +96,7 @@ jobs: release_name: Release ${{ steps.bump-version.outputs.next-version }} body: | Changes in this Release - ${{ steps.extract-release-notes.outputs.changelog }} + echo $( Date: Sun, 27 Dec 2020 11:06:14 +0530 Subject: [PATCH 45/47] Updated command --- .github/workflows/build.yml | 4 ++-- .github/workflows/main.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 82ff9bb..fb17895 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -95,8 +95,8 @@ jobs: tag_name: v${{ steps.bump-version.outputs.next-version }} release_name: Release ${{ steps.bump-version.outputs.next-version }} body: | - Changes in this Release - echo $( Date: Sun, 27 Dec 2020 11:14:44 +0530 Subject: [PATCH 46/47] Printing md file --- .github/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fb17895..3cbcce2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -86,6 +86,9 @@ jobs: name: ChoukaBara-Windows.tgz path: ~/artifacts/windows + - name: Printing md file + run: echo $( Date: Sun, 27 Dec 2020 11:19:45 +0530 Subject: [PATCH 47/47] Used body_path instead of body --- .github/workflows/build.yml | 7 +------ .github/workflows/main.yml | 4 +--- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3cbcce2..c5b3a42 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -86,9 +86,6 @@ jobs: name: ChoukaBara-Windows.tgz path: ~/artifacts/windows - - name: Printing md file - run: echo $(