Skip to content

Commit 8722a6d

Browse files
AndrewKahrAndrewKahr
authored
Update Windows to 2022 and enable Android Windows Images (#231)
- Update windows images to 2022 from 2019. We need to do this because 2019 will go EOL in January which means Github will start failing builds using it and ultimately remove it within a few months after EOL based on how they operated with Server 2016. This means people will need to upgrade their workflows to use windows-2022 instead of windows-2019 and update any self hosted runners to support server-2022 containers (either use Windows Server 2022 or Windows 11 as their host) - Setup Android dependencies to allow for Android builds on Windows. This enables using Burst on Android builds which is a major performance booster. - Update several action workflow versions to fix dependabot warnings - Setup better test exclusion patterns for Windows - Move Unity install path to C:/UnityEditor. This fixes old versions of sdkmanager that don't handle spaces in the path. Using the UNITY_PATH environment variable will mitigate any changes like this in the future in downstream scripts.
1 parent 9962a6a commit 8722a6d

18 files changed

+286
-141
lines changed

‎.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Docs 📚
22

33
on:
4-
push: { branches: [ main ] }
4+
push: { branches: [main] }
55

66
jobs:
77
updateDescriptions:
@@ -16,7 +16,7 @@ jobs:
1616
- editor
1717
steps:
1818
- name: Checkout
19-
uses: actions/checkout@v3
19+
uses: actions/checkout@v4
2020
# Caveat - Currently we use the ubuntu readme as we do not have a catch-all readme (yet?)
2121
- run: |
2222
echo "SHORT_DESCRIPTION=$(cat ./images/ubuntu/${{ matrix.imageType }}/100-characters-dockerhub-description.txt)" >> $GITHUB_ENV

‎.github/workflows/new-ubuntu-base-image-requested.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- name: Checkout
20-
uses: actions/checkout@v3
20+
uses: actions/checkout@v4
2121
with:
2222
fetch-depth: 0
2323

2424
- name: Checkout latest release tag
2525
run: |
2626
LATEST_TAG=$(git describe --tags `git rev-list --tags --max-count=1`)
2727
git checkout $LATEST_TAG
28-
28+
2929
#################
3030
# Variables #
3131
#################
@@ -50,11 +50,11 @@ jobs:
5050
# Setup #
5151
#############
5252
- name: Set up QEMU
53-
uses: docker/setup-qemu-action@v2
53+
uses: docker/setup-qemu-action@v3
5454
- name: Set up Docker Buildx
55-
uses: docker/setup-buildx-action@v2
55+
uses: docker/setup-buildx-action@v3
5656
- name: Login to DockerHub
57-
uses: docker/login-action@v2
57+
uses: docker/login-action@v3
5858
with:
5959
username: ${{ secrets.DOCKERHUB_USERNAME }}
6060
password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -81,7 +81,7 @@ jobs:
8181
# Base image #
8282
##################
8383
- name: Build and publish
84-
uses: docker/build-push-action@v4
84+
uses: docker/build-push-action@v5
8585
id: build_ubuntu_base_image
8686
with:
8787
file: ./images/ubuntu/base/Dockerfile

‎.github/workflows/new-ubuntu-hub-image-requested.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- name: Checkout
20-
uses: actions/checkout@v3
20+
uses: actions/checkout@v4
2121
with:
2222
fetch-depth: 0
2323

2424
- name: Checkout latest release tag
2525
run: |
2626
LATEST_TAG=$(git describe --tags `git rev-list --tags --max-count=1`)
2727
git checkout $LATEST_TAG
28-
28+
2929
#################
3030
# Variables #
3131
#################
@@ -50,11 +50,11 @@ jobs:
5050
# Setup #
5151
#############
5252
- name: Set up QEMU
53-
uses: docker/setup-qemu-action@v2
53+
uses: docker/setup-qemu-action@v3
5454
- name: Set up Docker Buildx
55-
uses: docker/setup-buildx-action@v2
55+
uses: docker/setup-buildx-action@v3
5656
- name: Login to DockerHub
57-
uses: docker/login-action@v2
57+
uses: docker/login-action@v3
5858
with:
5959
username: ${{ secrets.DOCKERHUB_USERNAME }}
6060
password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -86,7 +86,7 @@ jobs:
8686
# Hub image #
8787
#################
8888
- name: Build and publish
89-
uses: docker/build-push-action@v4
89+
uses: docker/build-push-action@v5
9090
id: build_ubuntu_hub_image
9191
with:
9292
file: ./images/ubuntu/hub/Dockerfile

‎.github/workflows/new-ubuntu-legacy-editor-image-requested.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ jobs:
2727
- webgl
2828
steps:
2929
- name: Checkout
30-
uses: actions/checkout@v3
30+
uses: actions/checkout@v4
3131
with:
3232
fetch-depth: 0
3333

3434
- name: Checkout latest release tag
3535
run: |
3636
LATEST_TAG=$(git describe --tags `git rev-list --tags --max-count=1`)
3737
git checkout $LATEST_TAG
38-
38+
3939
#################
4040
# Variables #
4141
#################
@@ -64,11 +64,11 @@ jobs:
6464
# Setup #
6565
#############
6666
- name: Set up QEMU
67-
uses: docker/setup-qemu-action@v2
67+
uses: docker/setup-qemu-action@v3
6868
- name: Set up Docker Buildx
69-
uses: docker/setup-buildx-action@v2
69+
uses: docker/setup-buildx-action@v3
7070
- name: Login to DockerHub
71-
uses: docker/login-action@v2
71+
uses: docker/login-action@v3
7272
with:
7373
username: ${{ secrets.DOCKERHUB_USERNAME }}
7474
password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -99,7 +99,7 @@ jobs:
9999
# Ubuntu Editor image #
100100
###########################
101101
- name: Build and publish
102-
uses: docker/build-push-action@v4
102+
uses: docker/build-push-action@v5
103103
id: build_ubuntu_editor_image
104104
continue-on-error: true
105105
with:
@@ -126,7 +126,7 @@ jobs:
126126
# Retry the above #
127127
#######################
128128
- name: Build and publish (retry)
129-
uses: docker/build-push-action@v4
129+
uses: docker/build-push-action@v5
130130
if: steps.build_ubuntu_editor_image.outcome=='failure'
131131
id: build_ubuntu_editor_image_retry
132132
with:

‎.github/workflows/new-ubuntu-post-2019-2-editor-image-requested.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ jobs:
2727
- webgl
2828
steps:
2929
- name: Checkout
30-
uses: actions/checkout@v3
30+
uses: actions/checkout@v4
3131
with:
3232
fetch-depth: 0
3333

3434
- name: Checkout latest release tag
3535
run: |
3636
LATEST_TAG=$(git describe --tags `git rev-list --tags --max-count=1`)
3737
git checkout $LATEST_TAG
38-
38+
3939
#################
4040
# Variables #
4141
#################
@@ -64,11 +64,11 @@ jobs:
6464
# Setup #
6565
#############
6666
- name: Set up QEMU
67-
uses: docker/setup-qemu-action@v2
67+
uses: docker/setup-qemu-action@v3
6868
- name: Set up Docker Buildx
69-
uses: docker/setup-buildx-action@v2
69+
uses: docker/setup-buildx-action@v3
7070
- name: Login to DockerHub
71-
uses: docker/login-action@v2
71+
uses: docker/login-action@v3
7272
with:
7373
username: ${{ secrets.DOCKERHUB_USERNAME }}
7474
password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -99,7 +99,7 @@ jobs:
9999
# Ubuntu Editor image #
100100
###########################
101101
- name: Build and publish
102-
uses: docker/build-push-action@v4
102+
uses: docker/build-push-action@v5
103103
id: build_ubuntu_editor_image
104104
continue-on-error: true
105105
with:
@@ -126,7 +126,7 @@ jobs:
126126
# Retry the above #
127127
#######################
128128
- name: Build and publish (retry)
129-
uses: docker/build-push-action@v4
129+
uses: docker/build-push-action@v5
130130
if: steps.build_ubuntu_editor_image.outcome=='failure'
131131
id: build_ubuntu_editor_image_retry
132132
with:

‎.github/workflows/new-windows-base-image-requested.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@ on:
88
workflow_dispatch:
99
inputs:
1010
jobId:
11-
description: 'Job ID'
11+
description: "Job ID"
1212
required: true
13-
default: 'dryRun'
13+
default: "dryRun"
1414
repoVersionFull:
15-
description: 'All digits of the latest tag of this repository, e.g. `1.23.45`'
15+
description: "All digits of the latest tag of this repository, e.g. `1.23.45`"
1616
required: true
1717
repoVersionMinor:
18-
description: 'Minor digit of that tag, e.g. `23`'
18+
description: "Minor digit of that tag, e.g. `23`"
1919
required: true
2020
repoVersionMajor:
21-
description: 'Major digit of that tag, e.g. `1`'
21+
description: "Major digit of that tag, e.g. `1`"
2222
required: true
2323

2424
# Further reading:
@@ -29,10 +29,10 @@ on:
2929
jobs:
3030
build:
3131
name: "🛠 Build unityci/base"
32-
runs-on: windows-2019
32+
runs-on: windows-2022
3333
steps:
3434
- name: Checkout
35-
uses: actions/checkout@v3
35+
uses: actions/checkout@v4
3636
with:
3737
fetch-depth: 0
3838

‎.github/workflows/new-windows-hub-image-requested.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@ on:
88
workflow_dispatch:
99
inputs:
1010
jobId:
11-
description: 'Job ID'
11+
description: "Job ID"
1212
required: true
13-
default: 'dryRun'
13+
default: "dryRun"
1414
repoVersionFull:
15-
description: 'All digits of the latest tag of this repository, e.g. `1.23.45`'
15+
description: "All digits of the latest tag of this repository, e.g. `1.23.45`"
1616
required: true
1717
repoVersionMinor:
18-
description: 'Minor digit of that tag, e.g. `23`'
18+
description: "Minor digit of that tag, e.g. `23`"
1919
required: true
2020
repoVersionMajor:
21-
description: 'Major digit of that tag, e.g. `1`'
21+
description: "Major digit of that tag, e.g. `1`"
2222
required: true
2323

2424
# Further reading:
@@ -29,10 +29,10 @@ on:
2929
jobs:
3030
build:
3131
name: "🛠 Build unityci/hub"
32-
runs-on: windows-2019
32+
runs-on: windows-2022
3333
steps:
3434
- name: Checkout
35-
uses: actions/checkout@v3
35+
uses: actions/checkout@v4
3636
with:
3737
fetch-depth: 0
3838

@@ -112,7 +112,6 @@ jobs:
112112
113113
# TODO: Cache layers, currently not supported on windows
114114

115-
116115
############################
117116
# Pull previous images #
118117
############################

‎.github/workflows/new-windows-legacy-editor-image-requested.yml

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,25 @@ on:
44
workflow_dispatch:
55
inputs:
66
jobId:
7-
description: 'Job ID'
7+
description: "Job ID"
88
required: true
9-
default: 'dryRun'
9+
default: "dryRun"
1010
editorVersion:
11-
description: 'Unity Editor Version'
11+
description: "Unity Editor Version"
1212
required: true
13-
default: '2020.3.24f1'
13+
default: "2020.3.24f1"
1414
changeSet:
15-
description: 'Unity Editor Changeset'
15+
description: "Unity Editor Changeset"
1616
required: true
17-
default: '79c78de19888'
17+
default: "79c78de19888"
1818
repoVersionFull:
19-
description: 'All digits of the latest tag of this repository, e.g. `1.23.45`'
19+
description: "All digits of the latest tag of this repository, e.g. `1.23.45`"
2020
required: true
2121
repoVersionMinor:
22-
description: 'Minor digit of that tag, e.g. `23`'
22+
description: "Minor digit of that tag, e.g. `23`"
2323
required: true
2424
repoVersionMajor:
25-
description: 'Major digit of that tag, e.g. `1`'
25+
description: "Major digit of that tag, e.g. `1`"
2626
required: true
2727

2828
# Further reading:
@@ -33,19 +33,16 @@ on:
3333
jobs:
3434
buildImage:
3535
name: "🛠 Build unityci/editor (${{ matrix.targetPlatform }})"
36-
runs-on: windows-2019
36+
runs-on: windows-2022
3737
strategy:
3838
fail-fast: false
3939
matrix:
4040
targetPlatform:
4141
- base
42-
# - windows-il2cpp
43-
# - universal-windows-platform
44-
# - appletv
4542

4643
steps:
4744
- name: Checkout
48-
uses: actions/checkout@v3
45+
uses: actions/checkout@v4
4946
with:
5047
fetch-depth: 0
5148

@@ -54,7 +51,7 @@ jobs:
5451
LATEST_TAG=$(git describe --tags `git rev-list --tags --max-count=1`)
5552
git checkout $LATEST_TAG
5653
shell: bash
57-
54+
5855
#################
5956
# Variables #
6057
#################

0 commit comments

Comments
 (0)