Browse Source

Use ubuntu 20.04 for CI (#11046)

* [ci] can't use ubuntu 18.04 today

* [ci] opam cache buster

* [ci] fix flash for ubuntu 20.04

* Update CI workflow sources
Rudy Ges 2 years ago
parent
commit
b81413f730

+ 9 - 9
.github/workflows/main.yml

@@ -243,7 +243,7 @@ jobs:
 
 
 
 
   linux-build:
   linux-build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     env:
     env:
       PLATFORM: linux64
       PLATFORM: linux64
       OPAMYES: 1
       OPAMYES: 1
@@ -257,7 +257,7 @@ jobs:
         uses: actions/[email protected]
         uses: actions/[email protected]
         with:
         with:
           path: ~/.opam/
           path: ~/.opam/
-          key: ${{ runner.os }}-${{ hashFiles('./opam', './libs/') }}-1
+          key: ${{ runner.os }}-${{ hashFiles('./opam', './libs/') }}-2
 
 
       - name: Install Neko from S3
       - name: Install Neko from S3
         run: |
         run: |
@@ -342,7 +342,7 @@ jobs:
 
 
   linux-test:
   linux-test:
     needs: linux-build
     needs: linux-build
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     env:
     env:
       PLATFORM: linux64
       PLATFORM: linux64
       TEST: ${{matrix.target}}
       TEST: ${{matrix.target}}
@@ -360,7 +360,7 @@ jobs:
           - target: lua
           - target: lua
             APT_PACKAGES: ncurses-dev
             APT_PACKAGES: ncurses-dev
           - target: flash
           - target: flash
-            APT_PACKAGES: libglib2.0-0 libfreetype6 xvfb
+            APT_PACKAGES: libglib2.0-0 libgtk2.0-0 libfreetype6 xvfb
     steps:
     steps:
       - uses: actions/checkout@main
       - uses: actions/checkout@main
         with:
         with:
@@ -425,7 +425,7 @@ jobs:
 
 
   test-docgen:
   test-docgen:
     needs: linux-build
     needs: linux-build
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     env:
     env:
       PLATFORM: linux64
       PLATFORM: linux64
       HXCPP_COMPILE_CACHE: ~/hxcache
       HXCPP_COMPILE_CACHE: ~/hxcache
@@ -501,7 +501,7 @@ jobs:
         working-directory: ${{github.workspace}}/tests/docgen
         working-directory: ${{github.workspace}}/tests/docgen
 
 
   linux-arm64:
   linux-arm64:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     permissions:
     permissions:
       packages: write
       packages: write
     env:
     env:
@@ -572,7 +572,7 @@ jobs:
         uses: actions/[email protected]
         uses: actions/[email protected]
         with:
         with:
           path: ~/.opam/
           path: ~/.opam/
-          key: ${{ runner.os }}-${{ hashFiles('./opam', './libs/') }}-1
+          key: ${{ runner.os }}-${{ hashFiles('./opam', './libs/') }}-2
 
 
       - name: Install Neko from S3
       - name: Install Neko from S3
         run: |
         run: |
@@ -923,7 +923,7 @@ jobs:
   deploy:
   deploy:
     if: success() && github.repository_owner == 'HaxeFoundation' && github.event_name != 'pull_request'
     if: success() && github.repository_owner == 'HaxeFoundation' && github.event_name != 'pull_request'
     needs: [linux-test, linux-arm64, mac-test, windows-test, windows64-test]
     needs: [linux-test, linux-arm64, mac-test, windows-test, windows64-test]
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
     steps:
       # this is only needed for to get `COMMIT_DATE`...
       # this is only needed for to get `COMMIT_DATE`...
       # maybe https://github.community/t/expose-commit-timestamp-in-the-github-context-data/16460/3
       # maybe https://github.community/t/expose-commit-timestamp-in-the-github-context-data/16460/3
@@ -999,7 +999,7 @@ jobs:
   deploy_apidoc:
   deploy_apidoc:
     if: success() && github.repository_owner == 'HaxeFoundation' && github.event_name != 'pull_request'
     if: success() && github.repository_owner == 'HaxeFoundation' && github.event_name != 'pull_request'
     needs: [linux-test, linux-arm64, mac-test, windows-test, windows64-test]
     needs: [linux-test, linux-arm64, mac-test, windows-test, windows64-test]
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
     steps:
       - name: Install dependencies
       - name: Install dependencies
         run: |
         run: |

+ 1 - 1
extra/github-actions/cache-opam.yml

@@ -3,4 +3,4 @@
   uses: actions/[email protected]
   uses: actions/[email protected]
   with:
   with:
     path: ~/.opam/
     path: ~/.opam/
-    key: ${{ runner.os }}-${{ hashFiles('./opam', './libs/') }}-1
+    key: ${{ runner.os }}-${{ hashFiles('./opam', './libs/') }}-2

+ 7 - 7
extra/github-actions/workflows/main.yml

@@ -75,7 +75,7 @@ jobs:
       @import build-windows.yml
       @import build-windows.yml
 
 
   linux-build:
   linux-build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     env:
     env:
       PLATFORM: linux64
       PLATFORM: linux64
       OPAMYES: 1
       OPAMYES: 1
@@ -152,7 +152,7 @@ jobs:
 
 
   linux-test:
   linux-test:
     needs: linux-build
     needs: linux-build
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     env:
     env:
       PLATFORM: linux64
       PLATFORM: linux64
       TEST: ${{matrix.target}}
       TEST: ${{matrix.target}}
@@ -170,7 +170,7 @@ jobs:
           - target: lua
           - target: lua
             APT_PACKAGES: ncurses-dev
             APT_PACKAGES: ncurses-dev
           - target: flash
           - target: flash
-            APT_PACKAGES: libglib2.0-0 libfreetype6 xvfb
+            APT_PACKAGES: libglib2.0-0 libgtk2.0-0 libfreetype6 xvfb
     steps:
     steps:
       - uses: actions/checkout@main
       - uses: actions/checkout@main
         with:
         with:
@@ -219,7 +219,7 @@ jobs:
 
 
   test-docgen:
   test-docgen:
     needs: linux-build
     needs: linux-build
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     env:
     env:
       PLATFORM: linux64
       PLATFORM: linux64
       HXCPP_COMPILE_CACHE: ~/hxcache
       HXCPP_COMPILE_CACHE: ~/hxcache
@@ -279,7 +279,7 @@ jobs:
         working-directory: ${{github.workspace}}/tests/docgen
         working-directory: ${{github.workspace}}/tests/docgen
 
 
   linux-arm64:
   linux-arm64:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     permissions:
     permissions:
       packages: write
       packages: write
     env:
     env:
@@ -429,7 +429,7 @@ jobs:
   deploy:
   deploy:
     if: success() && github.repository_owner == 'HaxeFoundation' && github.event_name != 'pull_request'
     if: success() && github.repository_owner == 'HaxeFoundation' && github.event_name != 'pull_request'
     needs: [linux-test, linux-arm64, mac-test, windows-test, windows64-test]
     needs: [linux-test, linux-arm64, mac-test, windows-test, windows64-test]
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
     steps:
       # this is only needed for to get `COMMIT_DATE`...
       # this is only needed for to get `COMMIT_DATE`...
       # maybe https://github.community/t/expose-commit-timestamp-in-the-github-context-data/16460/3
       # maybe https://github.community/t/expose-commit-timestamp-in-the-github-context-data/16460/3
@@ -505,7 +505,7 @@ jobs:
   deploy_apidoc:
   deploy_apidoc:
     if: success() && github.repository_owner == 'HaxeFoundation' && github.event_name != 'pull_request'
     if: success() && github.repository_owner == 'HaxeFoundation' && github.event_name != 'pull_request'
     needs: [linux-test, linux-arm64, mac-test, windows-test, windows64-test]
     needs: [linux-test, linux-arm64, mac-test, windows-test, windows64-test]
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
     steps:
       - name: Install dependencies
       - name: Install dependencies
         run: |
         run: |