Signed-off-by: Igor Munkin <
imun@tarantool.org>
---
.github/workflows/gnumake-builds-testing.yml | 20 ++------------------
.github/workflows/lint.yml | 2 +-
.github/workflows/testing.yml | 20 ++------------------
3 files changed, 5 insertions(+), 37 deletions(-)
diff --git a/.github/workflows/gnumake-builds-testing.yml b/.github/workflows/gnumake-builds-testing.yml
index ad9d5015..e5f82780 100644
--- a/.github/workflows/gnumake-builds-testing.yml
+++ b/.github/workflows/gnumake-builds-testing.yml
@@ -38,22 +38,6 @@ jobs:
GC64: [ON, OFF]
OS: [Linux, macOS]
include:
- - ARCH: ARM64
- OS: Linux
- NAME: Linux/aarch64
- RUNNER: graviton
- - ARCH: x86_64
- OS: Linux
- NAME: Linux/x86_64
- RUNNER: ubuntu-20.04-self-hosted
- - ARCH: ARM64
- OS: macOS
- NAME: macOS/M1
- RUNNER: macos-11-m1
- - ARCH: x86_64
- OS: macOS
- NAME: macOS/x86_64
- RUNNER: macos-11
- BUILDTYPE: Debug
CMAKEFLAGS: -DCMAKE_BUILD_TYPE=Debug -DLUA_USE_ASSERT=ON -DLUA_USE_APICHECK=ON
MAKEBUILDFLAGS: -DLUA_USE_ASSERT -DLUA_USE_APICHECK
@@ -70,10 +54,10 @@ jobs:
GC64: OFF
- OS: macOS
GC64: OFF
- runs-on: [self-hosted, '${{ matrix.RUNNER }}']
+ runs-on: [self-hosted, regular, '${{ matrix.OS }}', '${{ matrix.ARCH }}']
name: >
LuaJIT
- (${{ matrix.NAME }})
+ (${{ matrix.OS }}/${{ matrix.ARCH }})
${{ matrix.BUILDTYPE }}
GC64:${{ matrix.GC64 }}
steps:
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index e565144c..02150922 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -30,7 +30,7 @@ concurrency:
jobs:
test-luacheck:
- runs-on: ubuntu-20.04-self-hosted
+ runs-on: [self-hosted, lightweight, Linux, x86_64]
name: luacheck
steps:
- uses: actions/checkout@v2.3.4
diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
index 958f8e27..5558e3ea 100644
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -38,22 +38,6 @@ jobs:
GC64: [ON, OFF]
OS: [Linux, macOS]
include:
- - ARCH: ARM64
- OS: Linux
- NAME: Linux/aarch64
- RUNNER: graviton
- - ARCH: x86_64
- OS: Linux
- NAME: Linux/x86_64
- RUNNER: ubuntu-20.04-self-hosted
- - ARCH: ARM64
- OS: macOS
- NAME: macOS/M1
- RUNNER: macos-11-m1
- - ARCH: x86_64
- OS: macOS
- NAME: macOS/x86_64
- RUNNER: macos-11
- BUILDTYPE: Debug
CMAKEFLAGS: -DCMAKE_BUILD_TYPE=Debug -DLUA_USE_ASSERT=ON -DLUA_USE_APICHECK=ON
- BUILDTYPE: Release
@@ -63,10 +47,10 @@ jobs:
GC64: OFF
- OS: macOS
GC64: OFF
- runs-on: [self-hosted, '${{ matrix.RUNNER }}']
+ runs-on: [self-hosted, regular, '${{ matrix.OS }}', '${{ matrix.ARCH }}']
name: >
LuaJIT
- (${{ matrix.NAME }})
+ (${{ matrix.OS }}/${{ matrix.ARCH }})
${{ matrix.BUILDTYPE }}
GC64:${{ matrix.GC64 }}
steps:
--
2.34.0