Use Ubuntu 24.04 in GitHub Actions

minoki · May 9, 2024 · 8585853 · 8585853
1 parent c15efb9
commit 8585853
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 13 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -3,7 +3,7 @@ name: ci
 jobs:
   build-and-test:
     name: build-and-test
-    runs-on: ubuntu-20.04 # 22.04 doesn't contain mlton
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - name: Install dependencies
@@ -16,10 +16,7 @@ jobs:
         run: make test-lua
       - name: Test (LuaJIT)
         run: make test-luajit
-        env:
-          LUA_INIT_5_3: ""
-          # LuaJIT: Workaround https://github.com/LuaJIT/LuaJIT/issues/859
-          LUA_INIT: "local c=math.ceil;math.ceil=function(x)if-1<x and x<0 then return 0/(-1)else return c(x)end end"
+        # LuaJIT: Workaround for https://github.com/LuaJIT/LuaJIT/issues/859 is not required because Ubuntu 24.04's LuaJIT is recent enough.
       - name: Test (JS)
         run: make test-nodejs
       - name: Test (JS-CPS)

diff --git a/.github/workflows/package-npm.yaml b/.github/workflows/package-npm.yaml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   package_npm:
-    runs-on: ubuntu-20.04 # 22.04 doesn't contain mlton
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - name: Install dependencies

diff --git a/.github/workflows/validate.yaml b/.github/workflows/validate.yaml
@@ -8,7 +8,7 @@ jobs:
   validate-linux:
     name: validate (Linux)
     if: ${{ false }}
-    runs-on: ubuntu-20.04 # 22.04 doesn't contain mlton
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - name: Install dependencies
@@ -31,9 +31,7 @@ jobs:
         run: make test
       - name: Test (LuaJIT)
         run: make test-luajit
-        env:
-          # LuaJIT: Workaround https://github.com/LuaJIT/LuaJIT/issues/859
-          LUA_INIT: "local c=math.ceil;math.ceil=function(x)if-1<x and x<0 then return 0/(-1)else return c(x)end end"
+        # LuaJIT: Workaround for https://github.com/LuaJIT/LuaJIT/issues/859 is not required because Ubuntu 24.04's LuaJIT is recent enough.
       - name: Test (JS)
         run: make test-nodejs
       - name: Test (JS-CPS)
@@ -46,9 +44,7 @@ jobs:
         run: make validate-lua
       - name: Compile myself and validate(LuaJIT)
         run: make validate-luajit
-        env:
-          # LuaJIT: Workaround https://github.com/LuaJIT/LuaJIT/issues/859
-          LUA_INIT: "local c=math.ceil;math.ceil=function(x)if-1<x and x<0 then return 0/(-1)else return c(x)end end"
+        # LuaJIT: Workaround for https://github.com/LuaJIT/LuaJIT/issues/859 is not required because Ubuntu 24.04's LuaJIT is recent enough.
       - name: Compile myself and validate (JavaScript)
         run: make validate-js