Merge 0278463377c4fe8717539549535b29b4296f2b2a into 58c76080a0c654de906de9f554e2de45b1784929

Merge pull request #450 from luau-project/update-ci
Update CI
2025-04-05 16:36:45 +02:00 · 2025-03-10 16:21:41 +00:00 · 2025-03-01 00:59:17 +03:00 · 2025-03-01 00:58:23 +03:00 · 2025-03-01 00:57:51 +03:00 · 2025-02-23 11:22:32 +03:00
2 changed files with 5 additions and 5 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -13,7 +13,7 @@ jobs:
      fail-fast: false
      matrix:
        luaVersion: [ "5.4", "5.3", "5.2", "5.1", "luajit", "luajit-openresty" ]
-        platform: [ "ubuntu-22.04", "macos-11", "windows-2022" ]
+        platform: [ "ubuntu-22.04", "macos-14", "windows-2022" ]
    runs-on: ${{ matrix.platform }}
    steps:
      - name: Checkout
@ -22,11 +22,11 @@ jobs:
        if: ${{ startsWith(matrix.platform, 'windows') && !startsWith(matrix.luaVersion, 'luajit') }}
        uses: ilammy/msvc-dev-cmd@v1
      - name: Setup ‘lua’
-        uses: leso-kn/gh-actions-lua@v11-staging
+        uses: luarocks/gh-actions-lua@v10
        with:
          luaVersion: ${{ matrix.luaVersion }}
      - name: Setup ‘luarocks’
-        uses: hishamhm/gh-actions-luarocks@master
+        uses: luarocks/gh-actions-luarocks@v5
      - name: Make and install
        run: |
          luarocks make -- luasocket-scm-3.rockspec
--- a/docs/udp.html
+++ b/docs/udp.html
@ -149,8 +149,8 @@ wild-card address).
 <!-- gettimeout +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->

 <p class="name" id="gettimeout">
-connected:<b>settimeout(</b>value<b>)</b><br>
-unconnected:<b>settimeout(</b>value<b>)</b>
+connected:<b>gettimeout()</b><br>
+unconnected:<b>gettimeout()</b>
 </p>

 <p class="description">
Author	SHA1	Message	Date
johnd0e	9573b005df	Merge 0278463377c4fe8717539549535b29b4296f2b2a into 58c76080a0c654de906de9f554e2de45b1784929	2025-03-10 16:21:41 +00:00
Caleb Maclennan	58c76080a0	Merge pull request #450 from luau-project/update-ci Update CI	2025-03-01 00:59:17 +03:00
luau-project	250e4d48f7	fix: Use a macos version supported by GitHub Actions	2025-03-01 00:58:23 +03:00
luau-project	f139105c98	ci: Use GitHub Actions from luarocks namespace	2025-03-01 00:57:51 +03:00
Caleb Maclennan	66cdeca663	Merge pull request #447 from masakk1/patch-1	2025-02-23 11:22:32 +03:00
Masak1	676e5f3501	docs: Remove unnecessary `value` argument from gettimeout	2025-02-23 11:12:41 +03:00
Masak1	4dad084cfd	docs: Fix udp documentation gettimeout typo	2025-02-23 11:12:41 +03:00