Compare commits

..

No commits in common. "66795711def1799813a527d290472dbb1c406278" and "7727f04a91e273587f044a6c7605978ebc989e83" have entirely different histories.

16 changed files with 20 additions and 202 deletions

View file

@ -1,4 +1,4 @@
name: Test Action 3.x name: Test Action
on: [push, pull_request] on: [push, pull_request]
@ -13,5 +13,5 @@ jobs:
with: with:
name: test_project name: test_project
preset: linux preset: linux
projectDir: 3.x_test_project projectDir: test_project
package: 'true' package: 'true'

View file

@ -1,18 +0,0 @@
name: Test Action 4.x
on:
push:
branches: [ 'master', 'main', 'prod', 'production' ]
jobs:
TestAction:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v1
- name: Run Action
uses: ./
with:
name: test_project
preset: linux
projectDir: 4.x_test_project
package: 'true'

View file

@ -1,2 +0,0 @@
# Normalize EOL for all files that Git considers text files.
* text=auto eol=lf

View file

@ -1,2 +0,0 @@
# Godot 4+ specific ignores
.godot/

View file

@ -1,106 +0,0 @@
[preset.0]
name="linux"
platform="Linux/X11"
runnable=true
dedicated_server=false
custom_features=""
export_filter="all_resources"
include_filter=""
exclude_filter=""
export_path=""
encryption_include_filters=""
encryption_exclude_filters=""
encrypt_pck=false
encrypt_directory=false
script_encryption_key=""
[preset.0.options]
custom_template/debug=""
custom_template/release=""
debug/export_console_script=1
binary_format/embed_pck=false
texture_format/bptc=true
texture_format/s3tc=true
texture_format/etc=false
texture_format/etc2=false
binary_format/architecture="x86_64"
ssh_remote_deploy/enabled=false
ssh_remote_deploy/host="user@host_ip"
ssh_remote_deploy/port="22"
ssh_remote_deploy/extra_args_ssh=""
ssh_remote_deploy/extra_args_scp=""
ssh_remote_deploy/run_script="#!/usr/bin/env bash
export DISPLAY=:0
unzip -o -q \"{temp_dir}/{archive_name}\" -d \"{temp_dir}\"
\"{temp_dir}/{exe_name}\" {cmd_args}"
ssh_remote_deploy/cleanup_script="#!/usr/bin/env bash
kill $(pgrep -x -f \"{temp_dir}/{exe_name} {cmd_args}\")
rm -rf \"{temp_dir}\""
[preset.1]
name="windows"
platform="Windows Desktop"
runnable=true
dedicated_server=false
custom_features=""
export_filter="all_resources"
include_filter=""
exclude_filter=""
export_path=""
encryption_include_filters=""
encryption_exclude_filters=""
encrypt_pck=false
encrypt_directory=false
script_encryption_key=""
[preset.1.options]
custom_template/debug=""
custom_template/release=""
debug/export_console_script=1
binary_format/embed_pck=false
texture_format/bptc=true
texture_format/s3tc=true
texture_format/etc=false
texture_format/etc2=false
binary_format/architecture="x86_64"
codesign/enable=false
codesign/identity_type=0
codesign/identity=""
codesign/password=""
codesign/timestamp=true
codesign/timestamp_server_url=""
codesign/digest_algorithm=1
codesign/description=""
codesign/custom_options=PackedStringArray()
application/modify_resources=true
application/icon=""
application/console_wrapper_icon=""
application/icon_interpolation=4
application/file_version=""
application/product_version=""
application/company_name=""
application/product_name=""
application/file_description=""
application/copyright=""
application/trademarks=""
ssh_remote_deploy/enabled=false
ssh_remote_deploy/host="user@host_ip"
ssh_remote_deploy/port="22"
ssh_remote_deploy/extra_args_ssh=""
ssh_remote_deploy/extra_args_scp=""
ssh_remote_deploy/run_script="Expand-Archive -LiteralPath '{temp_dir}\\{archive_name}' -DestinationPath '{temp_dir}'
$action = New-ScheduledTaskAction -Execute '{temp_dir}\\{exe_name}' -Argument '{cmd_args}'
$trigger = New-ScheduledTaskTrigger -Once -At 00:00
$settings = New-ScheduledTaskSettingsSet
$task = New-ScheduledTask -Action $action -Trigger $trigger -Settings $settings
Register-ScheduledTask godot_remote_debug -InputObject $task -Force:$true
Start-ScheduledTask -TaskName godot_remote_debug
while (Get-ScheduledTask -TaskName godot_remote_debug | ? State -eq running) { Start-Sleep -Milliseconds 100 }
Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue"
ssh_remote_deploy/cleanup_script="Stop-ScheduledTask -TaskName godot_remote_debug -ErrorAction:SilentlyContinue
Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue
Remove-Item -Recurse -Force '{temp_dir}'"

View file

@ -1 +0,0 @@
<svg height="128" width="128" xmlns="http://www.w3.org/2000/svg"><g transform="translate(32 32)"><path d="m-16-32c-8.86 0-16 7.13-16 15.99v95.98c0 8.86 7.13 15.99 16 15.99h96c8.86 0 16-7.13 16-15.99v-95.98c0-8.85-7.14-15.99-16-15.99z" fill="#363d52"/><path d="m-16-32c-8.86 0-16 7.13-16 15.99v95.98c0 8.86 7.13 15.99 16 15.99h96c8.86 0 16-7.13 16-15.99v-95.98c0-8.85-7.14-15.99-16-15.99zm0 4h96c6.64 0 12 5.35 12 11.99v95.98c0 6.64-5.35 11.99-12 11.99h-96c-6.64 0-12-5.35-12-11.99v-95.98c0-6.64 5.36-11.99 12-11.99z" fill-opacity=".4"/></g><g stroke-width="9.92746" transform="matrix(.10073078 0 0 .10073078 12.425923 2.256365)"><path d="m0 0s-.325 1.994-.515 1.976l-36.182-3.491c-2.879-.278-5.115-2.574-5.317-5.459l-.994-14.247-27.992-1.997-1.904 12.912c-.424 2.872-2.932 5.037-5.835 5.037h-38.188c-2.902 0-5.41-2.165-5.834-5.037l-1.905-12.912-27.992 1.997-.994 14.247c-.202 2.886-2.438 5.182-5.317 5.46l-36.2 3.49c-.187.018-.324-1.978-.511-1.978l-.049-7.83 30.658-4.944 1.004-14.374c.203-2.91 2.551-5.263 5.463-5.472l38.551-2.75c.146-.01.29-.016.434-.016 2.897 0 5.401 2.166 5.825 5.038l1.959 13.286h28.005l1.959-13.286c.423-2.871 2.93-5.037 5.831-5.037.142 0 .284.005.423.015l38.556 2.75c2.911.209 5.26 2.562 5.463 5.472l1.003 14.374 30.645 4.966z" fill="#fff" transform="matrix(4.162611 0 0 -4.162611 919.24059 771.67186)"/><path d="m0 0v-47.514-6.035-5.492c.108-.001.216-.005.323-.015l36.196-3.49c1.896-.183 3.382-1.709 3.514-3.609l1.116-15.978 31.574-2.253 2.175 14.747c.282 1.912 1.922 3.329 3.856 3.329h38.188c1.933 0 3.573-1.417 3.855-3.329l2.175-14.747 31.575 2.253 1.115 15.978c.133 1.9 1.618 3.425 3.514 3.609l36.182 3.49c.107.01.214.014.322.015v4.711l.015.005v54.325c5.09692 6.4164715 9.92323 13.494208 13.621 19.449-5.651 9.62-12.575 18.217-19.976 26.182-6.864-3.455-13.531-7.369-19.828-11.534-3.151 3.132-6.7 5.694-10.186 8.372-3.425 2.751-7.285 4.768-10.946 7.118 1.09 8.117 1.629 16.108 1.846 24.448-9.446 4.754-19.519 7.906-29.708 10.17-4.068-6.837-7.788-14.241-11.028-21.479-3.842.642-7.702.88-11.567.926v.006c-.027 0-.052-.006-.075-.006-.024 0-.049.006-.073.006v-.006c-3.872-.046-7.729-.284-11.572-.926-3.238 7.238-6.956 14.642-11.03 21.479-10.184-2.264-20.258-5.416-29.703-10.17.216-8.34.755-16.331 1.848-24.448-3.668-2.35-7.523-4.367-10.949-7.118-3.481-2.678-7.036-5.24-10.188-8.372-6.297 4.165-12.962 8.079-19.828 11.534-7.401-7.965-14.321-16.562-19.974-26.182 4.4426579-6.973692 9.2079702-13.9828876 13.621-19.449z" fill="#478cbf" transform="matrix(4.162611 0 0 -4.162611 104.69892 525.90697)"/><path d="m0 0-1.121-16.063c-.135-1.936-1.675-3.477-3.611-3.616l-38.555-2.751c-.094-.007-.188-.01-.281-.01-1.916 0-3.569 1.406-3.852 3.33l-2.211 14.994h-31.459l-2.211-14.994c-.297-2.018-2.101-3.469-4.133-3.32l-38.555 2.751c-1.936.139-3.476 1.68-3.611 3.616l-1.121 16.063-32.547 3.138c.015-3.498.06-7.33.06-8.093 0-34.374 43.605-50.896 97.781-51.086h.066.067c54.176.19 97.766 16.712 97.766 51.086 0 .777.047 4.593.063 8.093z" fill="#478cbf" transform="matrix(4.162611 0 0 -4.162611 784.07144 817.24284)"/><path d="m0 0c0-12.052-9.765-21.815-21.813-21.815-12.042 0-21.81 9.763-21.81 21.815 0 12.044 9.768 21.802 21.81 21.802 12.048 0 21.813-9.758 21.813-21.802" fill="#fff" transform="matrix(4.162611 0 0 -4.162611 389.21484 625.67104)"/><path d="m0 0c0-7.994-6.479-14.473-14.479-14.473-7.996 0-14.479 6.479-14.479 14.473s6.483 14.479 14.479 14.479c8 0 14.479-6.485 14.479-14.479" fill="#414042" transform="matrix(4.162611 0 0 -4.162611 367.36686 631.05679)"/><path d="m0 0c-3.878 0-7.021 2.858-7.021 6.381v20.081c0 3.52 3.143 6.381 7.021 6.381s7.028-2.861 7.028-6.381v-20.081c0-3.523-3.15-6.381-7.028-6.381" fill="#fff" transform="matrix(4.162611 0 0 -4.162611 511.99336 724.73954)"/><path d="m0 0c0-12.052 9.765-21.815 21.815-21.815 12.041 0 21.808 9.763 21.808 21.815 0 12.044-9.767 21.802-21.808 21.802-12.05 0-21.815-9.758-21.815-21.802" fill="#fff" transform="matrix(4.162611 0 0 -4.162611 634.78706 625.67104)"/><path d="m0 0c0-7.994 6.477-14.473 14.471-14.473 8.002 0 14.479 6.479 14.479 14.473s-6.477 14.479-14.479 14.479c-7.994 0-14.471-6.485-14.471-14.479" fill="#414042" transform="matrix(4.162611 0 0 -4.162611 656.64056 631.05679)"/></g></svg>

Before

Width:  |  Height:  |  Size: 4.1 KiB

View file

@ -1,37 +0,0 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://bektdji2blm55"
path="res://.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://icon.svg"
dest_files=["res://.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
svg/scale=1.0
editor/scale_with_editor_scale=false
editor/convert_colors_with_editor_theme=false

View file

@ -1,15 +0,0 @@
; Engine configuration file.
; It's best edited using the editor UI and not directly,
; since the parameters that go here are not all obvious.
;
; Format:
; [section] ; section goes between []
; param=value ; assign values to parameters
config_version=5
[application]
config/name="Test Project"
config/features=PackedStringArray("4.0", "Forward Plus")
config/icon="res://icon.svg"

View file

@ -1,4 +1,4 @@
![Release Version](https://img.shields.io/github/v/release/krynv/build-godot-action) ![Release Version](https://img.shields.io/github/v/release/josephbmanley/build-godot-action) ![Test Action](https://github.com/josephbmanley/build-godot-action/workflows/Test%20Action/badge.svg)
![Build Godot Project](logo.png) ![Build Godot Project](logo.png)
@ -37,18 +37,18 @@ jobs:
matrix: matrix:
platform: [linux, windows, mac] platform: [linux, windows, mac]
steps: steps:
- uses: actions/checkout@v4.1.4 - uses: actions/checkout@v2
with: with:
lfs: true lfs: true
- name: Build - name: Build
id: build id: build
uses: krynv/build-godot-action@v1.0.0 uses: manleydev/build-godot-action@v1.4.1
with: with:
name: example name: example
preset: ${{ matrix.platform }} preset: ${{ matrix.platform }}
debugMode: "true" debugMode: "true"
- name: Upload Artifact - name: Upload Artifact
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v2
with: with:
name: Client - ${{ matrix.platform }} name: Client - ${{ matrix.platform }}
path: ${{ github.workspace }}/${{ steps.build.outputs.build }} path: ${{ github.workspace }}/${{ steps.build.outputs.build }}
@ -82,7 +82,7 @@ Additionally if you are not using a matrix, you can set the export preset as the
```yaml ```yaml
- name: Build - name: Build
id: build id: build
uses: krynv/build-godot-action@v1.4.1 uses: manleydev/build-godot-action@v1.4.1
with: with:
name: example name: example
preset: win32 preset: win32
@ -95,7 +95,7 @@ To change the export name, you can the `name` parameter to whatever you want you
```yaml ```yaml
- name: Build - name: Build
id: build id: build
uses: krynv/build-godot-action@v1.4.1 uses: manleydev/build-godot-action@v1.4.1
with: with:
name: test # This project will export with the name "test" name: test # This project will export with the name "test"
``` ```
@ -107,7 +107,7 @@ This example is set to build with debug mode enable. To disable debug, either se
```yaml ```yaml
- name: Build - name: Build
id: build id: build
uses: krynv/build-godot-action@v1.4.1 uses: manleydev/build-godot-action@v1.4.1
with: with:
name: example name: example
preset: ${{ matrix.platform }} preset: ${{ matrix.platform }}
@ -121,7 +121,7 @@ If your project is located in a subdirectory, you can use the `projectDir` to ch
```yaml ```yaml
- name: Build - name: Build
id: build id: build
uses: krynv/build-godot-action@v1.4.1 uses: manleydev/build-godot-action@v1.4.1
with: with:
name: example name: example
preset: ${{ matrix.platform }} preset: ${{ matrix.platform }}
@ -142,7 +142,7 @@ Example:
```yaml ```yaml
steps: steps:
- uses: krynv/build-godot-action@[VERSION] - uses: manleydev/build-godot-action@[VERSION]
with: with:
name: godot-project name: godot-project
preset: HTML5 preset: HTML5

View file

@ -1,6 +1,6 @@
name: "Build Godot Project" name: "Build Godot"
description: "Build a Godot project for multiple platforms" description: "Build a Godot project for multiple platforms"
author: krynv (based on original project from yeslayla & josephbman) author: josephbmanley
inputs: inputs:
name: name:
description: 'Name of the exported binary' description: 'Name of the exported binary'

View file

@ -2,16 +2,14 @@
set -e set -e
# Move godot templates already installed from the docker image to home # Move godot templates already installed from the docker image to home
mkdir -v -p ~/.local/share/godot/export_templates mv -n /root/.local ~
cp -a /root/.local/share/godot/export_templates/. ~/.local/share/godot/export_templates/ 2>/dev/null || :
if [ "$3" != "" ] if [ "$3" != "" ]
then then
SubDirectoryLocation="$3/" SubDirectoryLocation="$3/"
fi fi
mode="export-release" mode="export"
if [ "$6" = "true" ] if [ "$6" = "true" ]
then then
echo "Exporting in debug mode!" echo "Exporting in debug mode!"
@ -21,11 +19,12 @@ fi
# Export for project # Export for project
echo "Building $1 for $2" echo "Building $1 for $2"
mkdir -p $GITHUB_WORKSPACE/build/${SubDirectoryLocation:-""} mkdir -p $GITHUB_WORKSPACE/build/${SubDirectoryLocation:-""}
cd "$GITHUB_WORKSPACE/$5" cd ${5-"$GITHUB_WORKSPACE"}
godot --headless --${mode} "$2" $GITHUB_WORKSPACE/build/${SubDirectoryLocation:-""}$1 godot --${mode} $2 $GITHUB_WORKSPACE/build/${SubDirectoryLocation:-""}$1
echo "Build Done" echo "Build Done"
echo build=build/${SubDirectoryLocation:-""} >> $GITHUB_OUTPUT echo ::set-output name=build::build/${SubDirectoryLocation:-""}
if [ "$4" = "true" ] if [ "$4" = "true" ]
then then
@ -33,6 +32,6 @@ then
mkdir -p $GITHUB_WORKSPACE/package mkdir -p $GITHUB_WORKSPACE/package
cd $GITHUB_WORKSPACE/build cd $GITHUB_WORKSPACE/build
zip $GITHUB_WORKSPACE/package/artifact.zip ${SubDirectoryLocation:-"."} -r zip $GITHUB_WORKSPACE/package/artifact.zip ${SubDirectoryLocation:-"."} -r
echo artifact=package/artifact.zip >> $GITHUB_OUTPUT echo ::set-output name=artifact::package/artifact.zip
echo "Done" echo "Done"
fi fi