Skip to content

Commit d27007c

Browse files
committed
CI: switch to GitHub Actions
This is a merge commit.
1 parent 2bbaf95 commit d27007c

25 files changed

+523
-1050
lines changed

.builds/freebsd.yml

Lines changed: 0 additions & 8 deletions
This file was deleted.

.github/workflows/ci.yaml

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
name: push_ci
2+
run-name: Push CI
3+
on:
4+
push:
5+
branches:
6+
- master
7+
jobs:
8+
aarch64-linux:
9+
runs-on: [self-hosted, Linux, aarch64]
10+
steps:
11+
- name: Checkout
12+
uses: actions/checkout@v3
13+
- name: Build and Test
14+
run: sh ./ci/linux/build-aarch64.sh
15+
x86_64-linux-debug:
16+
runs-on: ubuntu-latest
17+
steps:
18+
- name: Checkout
19+
uses: actions/checkout@v3
20+
- name: Build and Test
21+
run: sh ./ci/linux/build-x86_64-debug.sh
22+
x86_64-linux-release:
23+
runs-on: ubuntu-latest
24+
steps:
25+
- name: Checkout
26+
uses: actions/checkout@v3
27+
- name: Build and Test
28+
run: sh ./ci/linux/build-x86_64-release.sh
29+
x86_64-macos:
30+
strategy:
31+
matrix:
32+
version: ["11", "12"]
33+
runs-on: "macos-${{ matrix.version }}"
34+
env:
35+
ARCH: "x86_64"
36+
MACOS_VERSION: ${{ matrix.version }}
37+
steps:
38+
- name: Checkout
39+
uses: actions/checkout@v3
40+
41+
- name: Run Build Script
42+
run: ./ci/macos/build-x86_64.sh
43+
aarch64-macos:
44+
runs-on: [self-hosted, macOS, aarch64]
45+
env:
46+
ARCH: "aarch64"
47+
steps:
48+
- name: Checkout
49+
uses: actions/checkout@v3
50+
51+
- name: Run Build Script
52+
run: ./ci/macos/build-aarch64.sh
53+
x86_64-windows:
54+
runs-on: windows-latest
55+
env:
56+
ARCH: "x86_64"
57+
steps:
58+
- name: Checkout
59+
uses: actions/checkout@v3
60+
61+
- name: Run Build Script
62+
run: ./ci/windows/build.ps1
63+
build-tarballs:
64+
needs: [aarch64-linux, x86_64-macos, aarch64-macos, x86_64-windows, x86_64-linux-debug, x86_64-linux-release]
65+
runs-on: [self-hosted, Linux, aarch64]
66+
steps:
67+
- name: Checkout
68+
uses: actions/checkout@v3
69+
- name: Build Tarballs
70+
run: sh ./ci/linux/build-tarballs.sh

CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ string(REGEX REPLACE "\\\\" "\\\\\\\\" ZIG_LIBC_INCLUDE_DIR_ESCAPED "${ZIG_LIBC_
118118
option(ZIG_TEST_COVERAGE "Build Zig with test coverage instrumentation" OFF)
119119

120120
set(ZIG_TARGET_TRIPLE "native" CACHE STRING "arch-os-abi to output binaries for")
121-
set(ZIG_TARGET_MCPU "baseline" CACHE STRING "-mcpu parameter to output binaries for")
121+
set(ZIG_TARGET_MCPU "native" CACHE STRING "-mcpu parameter to output binaries for")
122122
set(ZIG_EXECUTABLE "" CACHE STRING "(when cross compiling) path to already-built zig binary")
123123
set(ZIG_SINGLE_THREADED off CACHE BOOL "limit the zig compiler to use only 1 thread")
124124
set(ZIG_OMIT_STAGE2 off CACHE BOOL "omit the stage2 backend from stage1")
@@ -1033,8 +1033,8 @@ set(BUILD_ZIG2_ARGS
10331033
"-femit-bin=${ZIG2_OBJECT}"
10341034
-fcompiler-rt
10351035
${ZIG_SINGLE_THREADED_ARG}
1036-
-target "${ZIG_TARGET_TRIPLE}"
1037-
-mcpu "${ZIG_TARGET_MCPU}"
1036+
-target native
1037+
-mcpu native
10381038
-lc
10391039
--pkg-begin build_options "${ZIG_CONFIG_ZIG_OUT}"
10401040
--pkg-end

ci/azure/macos_script

Lines changed: 0 additions & 106 deletions
This file was deleted.

ci/azure/on_master_success

Lines changed: 0 additions & 12 deletions
This file was deleted.

ci/azure/pipelines.yml

Lines changed: 0 additions & 169 deletions
This file was deleted.

0 commit comments

Comments
 (0)