Skip to content

Commit

Permalink
Bump version to 0.9.1 + updata actions
Browse files Browse the repository at this point in the history
  • Loading branch information
CedNaru committed May 9, 2024
1 parent 684bb71 commit e2c6543
Show file tree
Hide file tree
Showing 11 changed files with 39 additions and 47 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/assemble_export_templates.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
shell: bash

- name: Download android export templates
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: export_template_android_all
path: android_templates/
Expand All @@ -34,7 +34,7 @@ jobs:
cp android_templates/android_release.apk templates/android_release.apk
- name: Download ios export template
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: export_template_all_ios

Expand All @@ -43,7 +43,7 @@ jobs:
run: mv export_template_all_ios.zip templates/ios.zip

- name: Download linux x86_64 debug export template
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: export_template_debug_linux_x86_64

Expand All @@ -52,7 +52,7 @@ jobs:
run: mv godot.linuxbsd.template_debug.x86_64 templates/linux_debug.x86_64

- name: Download linux x86_64 release export template
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: export_template_release_linux_x86_64

Expand All @@ -61,7 +61,7 @@ jobs:
run: mv godot.linuxbsd.template_release.x86_64 templates/linux_release.x86_64

- name: Download windows x86_64 debug export template
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: export_template_debug_windows_x86_64

Expand All @@ -70,7 +70,7 @@ jobs:
run: mv godot.windows.template_debug.x86_64.exe templates/windows_debug_x86_64.exe

- name: Download windows x86_64 release export template
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: export_template_release_windows_x86_64

Expand All @@ -79,7 +79,7 @@ jobs:
run: mv godot.windows.template_release.x86_64.exe templates/windows_release_x86_64.exe

- name: Download macos debug export template
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: export_template_all_macos

Expand All @@ -101,7 +101,7 @@ jobs:
shell: bash

- name: Upload artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: godot-kotlin-jvm_export_templates_${{ inputs.godot-kotlin-jvm-version }}.tpz
path: templates/godot-kotlin-jvm_export_templates_${{ inputs.godot-kotlin-jvm-version }}.tpz
4 changes: 2 additions & 2 deletions .github/workflows/assemble_ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
uses: ./.github/actions/godot-deps

- name: Download ios export template binaries
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: export_template_ios_all

Expand All @@ -51,7 +51,7 @@ jobs:
zip -q -9 -r export_template_all_ios.zip ios_xcode
- name: Upload iOS template app
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: export_template_all_ios
path: export_template_all_ios.zip
6 changes: 3 additions & 3 deletions .github/workflows/assemble_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ jobs:
arch: x86_64
steps:
- name: Download ${{ matrix.target }} editor
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: editor_${{ matrix.target }}_linux_${{ matrix.arch }}
path: godot-kotlin-jvm_editor_linuxbsd_${{ matrix.arch }}_${{ matrix.target }}_${{ inputs.godot-kotlin-jvm-version }}

- name: Download ${{ matrix.target }} bootstrap jar
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: jvm_godot-bootstrap_${{ matrix.target }}
path: godot-kotlin-jvm_editor_linuxbsd_${{ matrix.arch }}_${{ matrix.target }}_${{ inputs.godot-kotlin-jvm-version }}
Expand All @@ -46,7 +46,7 @@ jobs:
shell: bash

- name: Upload artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: godot-kotlin-jvm_editor_linuxbsd_${{ matrix.arch }}_${{ matrix.target }}_${{ inputs.godot-kotlin-jvm-version }}.zip
path: godot-kotlin-jvm_editor_linuxbsd_${{ matrix.arch }}_${{ matrix.target }}_${{ inputs.godot-kotlin-jvm-version }}/godot-kotlin-jvm_editor_linuxbsd_${{ matrix.arch }}_${{ matrix.target }}_${{ inputs.godot-kotlin-jvm-version }}.zip
24 changes: 12 additions & 12 deletions .github/workflows/assemble_macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@ jobs:
uses: actions/checkout@v4

- name: Download ${{ matrix.target }} x86_64 editor
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: editor_${{ matrix.target }}_macos_x86_64

- name: Download ${{ matrix.target }} arm64 editor
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: editor_${{ matrix.target }}_macos_arm64

Expand All @@ -52,7 +52,7 @@ jobs:
universal-output-binary: godot.macos.editor.${{ matrix.target }}.universal

- name: Upload ${{ matrix.target }} macos universal artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: editor_${{ matrix.target }}_macos_universal
path: godot.macos.editor.${{ matrix.target }}.universal
Expand Down Expand Up @@ -80,13 +80,13 @@ jobs:
ref: ${{ inputs.godot-version }}

- name: Download ${{ matrix.target }} editor
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: editor_${{ matrix.target }}_macos_universal
path: .

- name: Download ${{ matrix.target }} bootstrap jar
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: jvm_godot-bootstrap_${{ matrix.target }}
path: .
Expand All @@ -103,7 +103,7 @@ jobs:
shell: bash

- name: Upload artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: godot-kotlin-jvm_editor_macos_${{ matrix.arch }}_${{ matrix.target }}_${{ inputs.godot-kotlin-jvm-version }}.zip
path: godot-kotlin-jvm_editor_macos_${{ matrix.arch }}_${{ matrix.target }}_${{ inputs.godot-kotlin-jvm-version }}.zip
Expand All @@ -126,12 +126,12 @@ jobs:
uses: actions/checkout@v4

- name: Download ${{ matrix.target }} x86_64 export_template
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: export_template_${{ matrix.target }}_macos_x86_64

- name: Download ${{ matrix.target }} arm64 export_template
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: export_template_${{ matrix.target }}_macos_arm64

Expand All @@ -143,7 +143,7 @@ jobs:
universal-output-binary: godot.macos.template_${{ matrix.target }}.universal

- name: Upload ${{ matrix.target }} macos universal artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: export_template_${{ matrix.target }}_macos_universal
path: godot.macos.template_${{ matrix.target }}.universal
Expand All @@ -160,13 +160,13 @@ jobs:
ref: ${{ inputs.godot-version }}

- name: Download debug export_template
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: export_template_debug_macos_universal
path: .

- name: Download release export_template
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: export_template_release_macos_universal
path: .
Expand All @@ -182,7 +182,7 @@ jobs:
shell: bash

- name: Upload artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: export_template_all_macos
path: export_template_all_macos.zip
6 changes: 3 additions & 3 deletions .github/workflows/assemble_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ jobs:
arch: x86_64
steps:
- name: Download ${{ matrix.target }} editor
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: editor_${{ matrix.target }}_windows_${{ matrix.arch }}
path: godot-kotlin-jvm_editor_windows_${{ matrix.arch }}_${{ matrix.target }}_${{ inputs.godot-kotlin-jvm-version }}

- name: Download ${{ matrix.target }} bootstrap jar
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: jvm_godot-bootstrap_${{ matrix.target }}
path: godot-kotlin-jvm_editor_windows_${{ matrix.arch }}_${{ matrix.target }}_${{ inputs.godot-kotlin-jvm-version }}
Expand All @@ -47,7 +47,7 @@ jobs:
shell: bash

- name: Upload artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: godot-kotlin-jvm_editor_windows_${{ matrix.arch }}_${{ matrix.target }}_${{ inputs.godot-kotlin-jvm-version }}.zip
path: godot-kotlin-jvm_editor_windows_${{ matrix.arch }}_${{ matrix.target }}_${{ inputs.godot-kotlin-jvm-version }}/godot-kotlin-jvm_editor_windows_${{ matrix.arch }}_${{ matrix.target }}_${{ inputs.godot-kotlin-jvm-version }}.zip
8 changes: 0 additions & 8 deletions .github/workflows/build_macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,6 @@ jobs:
repository: godotengine/godot
ref: ${{ inputs.godot-version }}

# TODO: remove once on godot 4.2.2 or newer!
- name: Cherry pick macos fix
run: |
git fetch -a
git config --global user.email "[email protected]"
git config --global user.name "Super Mario"
git cherry-pick a2c1c01941a3dec3e2a361d9dc21bb0390efcbaf
- name: Clone Godot JVM module.
uses: actions/checkout@v4
with:
Expand Down
Empty file.
6 changes: 3 additions & 3 deletions .github/workflows/deploy_create_draft_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,19 +50,19 @@ jobs:
run: echo $(echo "$GITHUB_REF" | grep -Po '(\d+\.\d+\.\d+-\d+\.\d+\.\d+(-SNAPSHOT)?)') > deploy_godot_kotlin_jvm_version.txt

- name: Save Release URL File for publish
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: deploy_release_url
path: deploy_release_url.txt

- name: Save supported godot version for publish
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: deploy_godot_version
path: deploy_godot_version.txt

- name: Save godot kotlin jvm version for publish
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: deploy_godot_kotlin_jvm_version
path: deploy_godot_kotlin_jvm_version.txt
8 changes: 4 additions & 4 deletions .github/workflows/deploy_godot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
arch: universal
steps:
- name: Download deploy_release_url
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: deploy_release_url
path: '.'
Expand All @@ -48,7 +48,7 @@ jobs:
run: echo "release_url=$(cat deploy_release_url.txt)" >> $GITHUB_OUTPUT

- name: Download ${{ matrix.platform }} ${{ matrix.target }} editor for ${{ matrix.arch }}
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: godot-kotlin-jvm_editor_${{ matrix.platform }}_${{ matrix.arch }}_${{ matrix.target }}_${{ inputs.godot-kotlin-jvm-version }}.zip
path: '.'
Expand All @@ -68,7 +68,7 @@ jobs:
name: Deploy export templates
steps:
- name: Download deploy_release_url
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: deploy_release_url
path: '.'
Expand All @@ -78,7 +78,7 @@ jobs:
run: echo "release_url=$(cat deploy_release_url.txt)" >> $GITHUB_OUTPUT

- name: Download export templates
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: godot-kotlin-jvm_export_templates_${{ inputs.godot-kotlin-jvm-version }}.tpz
path: '.'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/trigger_on_pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ jobs:
- run: |
echo "Setup done"
outputs: # defined here explicitly, so it only needs to be defined here. All other workflows can just reference it
godot-kotlin-jvm-version: "0.8.3-4.2.1"
godot-version: "4.2.1-stable"
godot-kotlin-jvm-version: "0.9.1-4.2.2"
godot-version: "4.2.2-stable"
jvm-version: "17"

build-jvm:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/trigger_on_tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ jobs:
- run: |
echo "Setup done"
outputs: # defined here explicitly, so it only needs to be defined here. All other workflows can just reference it
godot-kotlin-jvm-version: "0.8.3-4.2.1"
godot-version: "4.2.1-stable"
godot-kotlin-jvm-version: "0.9.1-4.2.2"
godot-version: "4.2.2-stable"
jvm-version: "17"

build-jvm:
Expand Down

0 comments on commit e2c6543

Please sign in to comment.