Skip to content

Commit

Permalink
ci: update macos runners to macos-14, to make use of the much faster …
Browse files Browse the repository at this point in the history
…m1 instances (#20747)
  • Loading branch information
spytheman committed Feb 7, 2024
1 parent de1c431 commit dc2aee8
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/bootstrapping_works_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
|| github.event.repository.full_name != 'vlang/v'
strategy:
matrix:
os: [ubuntu-latest, macos-latest]
os: [ubuntu-latest, macos-14]
runs-on: ${{ matrix.os }}
timeout-minutes: 30
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/paths_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
./v test vlib/builtin vlib/os
space-paths-macos:
runs-on: macos-latest
runs-on: macos-14
if: github.event_name != 'push' || github.event.ref == 'refs/heads/master' || github.event.repository.full_name != 'vlang/v'
timeout-minutes: 30
env:
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/periodic_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Install dependencies 1
run: sudo apt-get install --quiet -y libssl-dev sqlite3 libsqlite3-dev
run: sudo apt-get install --quiet -y sqlite3 libsqlite3-dev
- name: Build v
run: make
- name: Symlink V
Expand All @@ -24,15 +24,13 @@ jobs:


network-tests-macos:
runs-on: macos-latest
runs-on: macos-14
if: github.event.ref == 'refs/heads/master' && github.event.repository.full_name == 'vlang/v'
timeout-minutes: 30
env:
V_CI_PERIODIC: 1
steps:
- uses: actions/checkout@v3
- name: Setup openssl library path
run: export LIBRARY_PATH="$LIBRARY_PATH:/usr/local/opt/openssl/lib/"
- name: Build V
run: make
- name: Symlink V
Expand Down
16 changes: 2 additions & 14 deletions .github/workflows/prebuilt.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
name: Test prebuilt binaries

on:
release:
types: [edited, published]

jobs:
ubuntu:
runs-on: ubuntu-20.04
timeout-minutes: 5
steps:
- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install --quiet -y postgresql libpq-dev libglfw3 libglfw3-dev libfreetype6-dev libssl-dev sqlite3 libsqlite3-dev valgrind
## sudo apt-get install --quiet -y libsdl2-dev libsdl2-ttf-dev libsdl2-mixer-dev libsdl2-image-dev
- name: Download V
run: |
tag=${GITHUB_REF##*/}
Expand All @@ -28,11 +25,6 @@ jobs:
runs-on: macos-latest
timeout-minutes: 5
steps:
- name: Install dependencies
run: |
brew install freetype glfw openssl
# brew install sdl2 sdl2_ttf sdl2_mixer sdl2_image
export LIBRARY_PATH="$LIBRARY_PATH:/usr/local/opt/openssl/lib/"
- name: Download V
run: |
tag=${GITHUB_REF##*/}
Expand All @@ -45,10 +37,6 @@ jobs:
cd v
./v run examples/hello_world.v
# NOTE: we cannot currently test the macos arm64 build without a apple silicon runner
# the arm64 release is cross compiled from intel. the apple silicon hosted runner is
# only currently available on the macos-latest-xlarge plan, not on the free plans.

windows:
runs-on: windows-latest
timeout-minutes: 5
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/time_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:

test-time-macos:
if: github.event_name != 'push' || github.event.ref == 'refs/heads/master' || github.event.repository.full_name != 'vlang/v'
runs-on: macos-latest
runs-on: macos-14
steps:
- uses: actions/checkout@v4
- name: Build V
Expand Down

0 comments on commit dc2aee8

Please sign in to comment.