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

[ci] upgrade to Ubuntu 22.04 #11912

Open
wants to merge 3 commits into
base: development
Choose a base branch
from
Open

[ci] upgrade to Ubuntu 22.04 #11912

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ef7b61f
[ci] upgrade to Ubuntu 22.04
Apprentice-Alchemist Jan 7, 2025
0d2bd5a
[ci] PPAs aren't needed anymore.
Apprentice-Alchemist Jan 7, 2025
6b621d7
[ci] invalidate linux opam cache
Apprentice-Alchemist Jan 7, 2025
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
16 changes: 7 additions & 9 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ jobs:


linux-build:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
env:
PLATFORM: linux64
OPAMYES: 1
Expand All @@ -118,7 +118,7 @@ jobs:
uses: actions/cache@v4
with:
path: ~/.opam/
key: ${{ runner.os }}-${{ matrix.ocaml }}-${{ hashFiles('./haxe.opam', './libs/') }}
key: ${{ runner.os }}-${{ matrix.ocaml }}-${{ hashFiles('./haxe.opam', './libs/') }}-1

- name: Install Neko from S3
run: |
Expand All @@ -143,8 +143,6 @@ jobs:
- name: Install dependencies
run: |
set -ex
sudo add-apt-repository ppa:avsm/ppa -y # provides OPAM 2
sudo add-apt-repository ppa:haxe/ocaml -y # provides newer version of mbedtls
sudo apt-get update -qqy
sudo apt-get install -qqy ocaml-nox opam libpcre2-dev zlib1g-dev libgtk2.0-dev libmbedtls-dev ninja-build

Expand Down Expand Up @@ -208,7 +206,7 @@ jobs:

linux-test:
needs: linux-build
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
env:
PLATFORM: linux64
TEST: ${{matrix.target}}
Expand Down Expand Up @@ -295,7 +293,7 @@ jobs:

test-docgen:
needs: linux-build
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
env:
PLATFORM: linux64
HXCPP_COMPILE_CACHE: ~/hxcache
Expand Down Expand Up @@ -374,7 +372,7 @@ jobs:
working-directory: ${{github.workspace}}/tests/docgen

linux-arm64:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
permissions:
packages: write
env:
Expand Down Expand Up @@ -749,7 +747,7 @@ jobs:
deploy:
if: success() && github.repository_owner == 'HaxeFoundation' && github.event_name != 'pull_request'
needs: [linux-test, linux-arm64, mac-test, windows64-test]
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
# this is only needed for to get `COMMIT_DATE`...
# maybe https://github.community/t/expose-commit-timestamp-in-the-github-context-data/16460/3
Expand Down Expand Up @@ -819,7 +817,7 @@ jobs:
deploy_apidoc:
if: success() && github.repository_owner == 'HaxeFoundation' && github.event_name != 'pull_request'
needs: [linux-test, linux-arm64, mac-test, windows64-test]
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Install dependencies
run: |
Expand Down
16 changes: 7 additions & 9 deletions extra/github-actions/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
@import build-windows.yml

linux-build:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
env:
PLATFORM: linux64
OPAMYES: 1
Expand All @@ -42,15 +42,13 @@ jobs:
uses: actions/cache@v4
with:
path: ~/.opam/
key: ${{ runner.os }}-${{ matrix.ocaml }}-${{ hashFiles('./haxe.opam', './libs/') }}
key: ${{ runner.os }}-${{ matrix.ocaml }}-${{ hashFiles('./haxe.opam', './libs/') }}-1

@import install-neko-unix.yml

- name: Install dependencies
run: |
set -ex
sudo add-apt-repository ppa:avsm/ppa -y # provides OPAM 2
sudo add-apt-repository ppa:haxe/ocaml -y # provides newer version of mbedtls
sudo apt-get update -qqy
sudo apt-get install -qqy ocaml-nox opam libpcre2-dev zlib1g-dev libgtk2.0-dev libmbedtls-dev ninja-build

Expand Down Expand Up @@ -114,7 +112,7 @@ jobs:

linux-test:
needs: linux-build
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
env:
PLATFORM: linux64
TEST: ${{matrix.target}}
Expand Down Expand Up @@ -183,7 +181,7 @@ jobs:

test-docgen:
needs: linux-build
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
env:
PLATFORM: linux64
HXCPP_COMPILE_CACHE: ~/hxcache
Expand Down Expand Up @@ -244,7 +242,7 @@ jobs:
working-directory: ${{github.workspace}}/tests/docgen

linux-arm64:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
permissions:
packages: write
env:
Expand Down Expand Up @@ -414,7 +412,7 @@ jobs:
deploy:
if: success() && github.repository_owner == 'HaxeFoundation' && github.event_name != 'pull_request'
needs: [linux-test, linux-arm64, mac-test, windows64-test]
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
# this is only needed for to get `COMMIT_DATE`...
# maybe https://github.community/t/expose-commit-timestamp-in-the-github-context-data/16460/3
Expand Down Expand Up @@ -484,7 +482,7 @@ jobs:
deploy_apidoc:
if: success() && github.repository_owner == 'HaxeFoundation' && github.event_name != 'pull_request'
needs: [linux-test, linux-arm64, mac-test, windows64-test]
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Install dependencies
run: |
Expand Down
Loading