diff --git a/.github/workflows/composite/buildSetup/action.yml b/.github/workflows/composite/buildSetup/action.yml index 0cbefee4..ebc7bcee 100644 --- a/.github/workflows/composite/buildSetup/action.yml +++ b/.github/workflows/composite/buildSetup/action.yml @@ -4,11 +4,14 @@ description: "Performs cross-platform build setup" runs: using: "composite" steps: - - name: Optionally set DEBUG_BUILD + - name: Optionally set BUILD_SUFFIX shell: bash - if: github.event.inputs.debug-build == 'true' run: | - echo "DEBUG_BUILD=-debug" >> $GITHUB_ENV + if [[ ${{ github.event.inputs.debug-build }} == 'true' ]]; then + echo "BUILD_SUFFIX=-debug" >> $GITHUB_ENV + else + echo "BUILD_SUFFIX=-release" >> $GITHUB_ENV + fi - name: Optionally set GH_USERNAME shell: bash if: github.event.inputs.include-username == 'true' @@ -19,7 +22,7 @@ runs: if: github.event.inputs.include-datetime == 'true' run: | echo "BUILD_TIME=-$(date --iso-8601=minutes | sed -e 's/:/-/g' | sed -e 's/\+.*//')" >> $GITHUB_ENV - - name: Set .net6.0 SDK + - name: Set .net7.0 SDK shell: bash run: | wget https://packages.microsoft.com/config/debian/10/packages-microsoft-prod.deb -O packages-microsoft-prod.deb @@ -28,7 +31,7 @@ runs: apt-get update -qq apt-get install -y apt-transport-https apt-get update -qq - apt-get install -y dotnet-sdk-6.0 + apt-get install -y dotnet-sdk-7.0 - name: Set FOLDER_NAME shell: bash run: | @@ -36,6 +39,5 @@ runs: - name: Setup shell: bash run: | - mkdir -v -p ~/.local/share/godot/templates - mv /root/.local/share/godot/templates/${GODOT_VERSION}.stable.mono ~/.local/share/godot/templates/${GODOT_VERSION}.stable.mono - \ No newline at end of file + mkdir -v -p ~/.local/share/godot/export_templates + mv /root/.local/share/godot/export_templates/${GODOT_VERSION}.stable.mono ~/.local/share/godot/export_templates/${GODOT_VERSION}.stable.mono diff --git a/.github/workflows/export-c7.yml b/.github/workflows/export-c7.yml index 9fdd4b54..b97811b2 100644 --- a/.github/workflows/export-c7.yml +++ b/.github/workflows/export-c7.yml @@ -19,14 +19,14 @@ on: default: true env: - GODOT_VERSION: 3.5 + GODOT_VERSION: 4.2.2 EXPORT_NAME: C7 jobs: Export-C7-Windows: runs-on: ubuntu-latest container: - image: barichello/godot-ci:mono-3.5 + image: barichello/godot-ci:mono-4.2.2 steps: - name: Checkout uses: actions/checkout@v2 @@ -37,7 +37,7 @@ jobs: run: | mkdir -v -p build/${FOLDER_NAME} cd ${EXPORT_NAME} - godot -v --export${DEBUG_BUILD} "Windows Desktop" ../build/${FOLDER_NAME}/${EXPORT_NAME}.exe + godot -v --headless --export${BUILD_SUFFIX} "Windows Desktop" ../build/${FOLDER_NAME}/${EXPORT_NAME}.exe - name: Copy Static Files run: | if cp -r ${EXPORT_NAME}/Text build/${FOLDER_NAME}/Text && cp -r ${EXPORT_NAME}/Art build/${FOLDER_NAME}/Art @@ -48,14 +48,14 @@ jobs: exit 1 fi - name: Upload Artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ env.FOLDER_NAME }}-Windows path: build/${{ ENV.FOLDER_NAME }} Export-C7-Linux: runs-on: ubuntu-latest container: - image: barichello/godot-ci:mono-3.5 + image: barichello/godot-ci:mono-4.2.2 steps: - name: Checkout uses: actions/checkout@v2 @@ -66,7 +66,7 @@ jobs: run: | mkdir -v -p build/${FOLDER_NAME} cd ${EXPORT_NAME} - godot -v --export${DEBUG_BUILD} "Linux/X11" ../build/${FOLDER_NAME}/${EXPORT_NAME}.x86_64 + godot -v --headless --export${BUILD_SUFFIX} "Linux/X11" ../build/${FOLDER_NAME}/${EXPORT_NAME}.x86_64 - name: Copy Static Files run: | if cp -r ${EXPORT_NAME}/Text build/${FOLDER_NAME}/Text && cp -r ${EXPORT_NAME}/Art build/${FOLDER_NAME}/Art @@ -80,14 +80,14 @@ jobs: run: | tar -C build -zcvf build/${FOLDER_NAME}.tgz ${FOLDER_NAME} - name: Upload Artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: path: build/${{ env.FOLDER_NAME }}.tgz name: ${{ env.FOLDER_NAME }}-Linux-x86_64 Export-C7-Mac: runs-on: ubuntu-latest container: - image: barichello/godot-ci:mono-3.5 + image: barichello/godot-ci:mono-4.2.2 steps: - name: Checkout uses: actions/checkout@v2 @@ -98,7 +98,7 @@ jobs: run: | mkdir -v -p build/${FOLDER_NAME} cd ${EXPORT_NAME} - godot -v --export${DEBUG_BUILD} "Mac OSX" ../build/${FOLDER_NAME}.zip + godot -v --headless --export${BUILD_SUFFIX} "macOS" ../build/${FOLDER_NAME}.zip - name: Copy Static Files run: | cd ${EXPORT_NAME} @@ -110,7 +110,7 @@ jobs: exit 1 fi - name: Upload Artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ env.FOLDER_NAME }}-Mac path: build/${{ env.FOLDER_NAME }}.zip