Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use dotnet image for godot 4 #106

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Use dotnet image for godot 4 #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
746c4d8
Use the dotnet sdk image for Godot 4 mono
AdrasteonDev Apr 23, 2023
00b662a
Addition of comments in CI files for Godot 4
AdrasteonDev Apr 23, 2023
9789cca
Addition of comments for macOS for Godot 4
AdrasteonDev Apr 24, 2023
721d3f5
Correction of a bug concerning export templates in the mono Dockerfile
AdrasteonDev Apr 24, 2023
93189b8
Merge branch 'master' into use-dotnet-image-for-godot-4
AdrasteonDev May 1, 2023
e263c48
Modification of the mono files following PR #107 and #108
AdrasteonDev May 1, 2023
4128231
Addition of comments in godot-ci.yml about Godot 4
AdrasteonDev Jul 16, 2023
752f949
Merge branch 'master' into use-dotnet-image-for-godot-4
AdrasteonDev Dec 24, 2023
9bd643e
Merge branch 'abarichello:master' into use-dotnet-image-for-godot-4
AdrasteonDev Jan 18, 2024
e518f8b
Merge branch 'abarichello:master' into use-dotnet-image-for-godot-4
AdrasteonDev Feb 1, 2024
ba37465
Merge branch 'master' into use-dotnet-image-for-godot-4
AdrasteonDev Feb 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/godot-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ env:
jobs:
export-windows:
name: Windows Export
runs-on: ubuntu-20.04
runs-on: ubuntu-20.04 # Use 22.04 with godot 4
container:
image: barichello/godot-ci:4.2.1
steps:
Expand All @@ -34,7 +34,7 @@ jobs:

export-linux:
name: Linux Export
runs-on: ubuntu-20.04
runs-on: ubuntu-20.04 # Use 22.04 with godot 4
container:
image: barichello/godot-ci:4.2.1
steps:
Expand All @@ -59,7 +59,7 @@ jobs:

export-web:
name: Web Export
runs-on: ubuntu-20.04
runs-on: ubuntu-20.04 # Use 22.04 with godot 4
container:
image: barichello/godot-ci:4.2.1
steps:
Expand Down Expand Up @@ -92,7 +92,7 @@ jobs:

export-mac:
name: Mac Export
runs-on: ubuntu-20.04
runs-on: ubuntu-20.04 # Use 22.04 with godot 4
container:
image: barichello/godot-ci:4.2.1
steps:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/manual_build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ jobs:
ghcr.io/${{ env.IMAGE_OWNER }}/${{ env.IMAGE_NAME }}:mono-${{ github.event.inputs.version }}${{ env.IMAGE_TAG }}
${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:mono-${{ github.event.inputs.version }}${{ env.IMAGE_TAG }}
build-args: |
IMAGE=${{ startsWith( github.event.inputs.version, '3.' ) && 'mono:latest' || 'mcr.microsoft.com/dotnet/sdk:7.0-jammy' }}
GODOT_VERSION=${{ github.event.inputs.version }}
RELEASE_NAME=${{ github.event.inputs.release_name }}
SUBDIR=${{ github.event.inputs.release_name != 'stable' && format('/{0}', github.event.inputs.release_name) || '' }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ jobs:
${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:mono-latest
${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:mono-${{ needs.version.outputs.version }}
build-args: |
IMAGE=${{ startsWith( needs.version.outputs.version, '3.' ) && 'mono:latest' || 'mcr.microsoft.com/dotnet/sdk:7.0-jammy' }}
GODOT_VERSION=${{ needs.version.outputs.version }}
RELEASE_NAME=${{ needs.version.outputs.release_name }}
ZIP_GODOT_PLATFORM=${{ startsWith( needs.version.outputs.version, '3.' ) && 'linux_headless_64' || 'linux_x86_64' }}
Expand Down
3 changes: 2 additions & 1 deletion .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ mac:
script:
- mkdir -v -p build/mac
- cd $EXPORT_NAME
- godot --headless --verbose --export-release "Mac OSX" ../build/mac/$EXPORT_NAME.zip
# Use "Mac OSX" instead of "macOS" with Godot 3
- godot --headless --verbose --export-release "macOS" ../build/mac/$EXPORT_NAME.zip
artifacts:
name: $EXPORT_NAME-$CI_JOB_NAME
paths:
Expand Down
7 changes: 3 additions & 4 deletions mono.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM mono:latest
ARG IMAGE="mono:latest"
FROM $IMAGE
LABEL author="https://github.com/aBARICHELLO/godot-ci/graphs/contributors"

USER root
Expand All @@ -7,8 +8,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
ca-certificates \
git \
git-lfs \
python \
python-openssl \
unzip \
wget \
zip \
Expand All @@ -17,7 +16,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \

# When in doubt see the downloads page
# https://downloads.tuxfamily.org/godotengine/
ARG GODOT_VERSION="3.4.2"
ARG GODOT_VERSION="4.0.2"

# Example values: stable, beta3, rc1, alpha2, etc.
# Also change the SUBDIR property when NOT using stable
Expand Down