From cd337e2e06b2721a8b57c069cbbe58f485ea7c0d Mon Sep 17 00:00:00 2001 From: Delyan Angelov Date: Sat, 11 Nov 2023 15:39:27 +0200 Subject: [PATCH] ci: add macos_arm64, macos_x86_64 in more jobs in binary_artifact.yml --- .github/workflows/binary_artifact.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/binary_artifact.yml b/.github/workflows/binary_artifact.yml index 42b1ddf014bcc7..9d6c9e3e917ec2 100644 --- a/.github/workflows/binary_artifact.yml +++ b/.github/workflows/binary_artifact.yml @@ -14,7 +14,7 @@ jobs: CC: gcc ZIPNAME: v_linux.zip steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Compile run: | make @@ -46,7 +46,7 @@ jobs: CC: clang ZIPNAME: v_macos_x86_64.zip steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Compile run: | make @@ -69,23 +69,23 @@ jobs: - name: Create artifact uses: actions/upload-artifact@v3 with: - name: macos + name: macos_x86_64 path: ${{ env.ZIPNAME }} - + build-macos-arm64: runs-on: macos-latest env: - CC: clang TARGET_CFLAGS: -target arm64-apple-darwin + VFLAGS: -skip-unused -cc clang ZIPNAME: v_macos_arm64.zip steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Compile run: | make - ./v -skip-unused -cc $CC -cflags "$TARGET_CFLAGS" -prod cmd/tools/vup.v - ./v -skip-unused -cc $CC -cflags "$TARGET_CFLAGS" -prod cmd/tools/vdoctor.v - ./v -skip-unused -cc $CC -cflags "$TARGET_CFLAGS" -prod -o v cmd/v + ./v -cflags "$TARGET_CFLAGS" -prod cmd/tools/vup.v + ./v -cflags "$TARGET_CFLAGS" -prod cmd/tools/vdoctor.v + ./v -cflags "$TARGET_CFLAGS" -prod -o v cmd/v - name: Remove excluded run: | rm -rf .git/ @@ -102,7 +102,7 @@ jobs: - name: Create artifact uses: actions/upload-artifact@v3 with: - name: macos + name: macos_arm64 path: ${{ env.ZIPNAME }} build-windows: @@ -111,7 +111,7 @@ jobs: CC: msvc ZIPNAME: v_windows.zip steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - uses: msys2/setup-msys2@v2 - name: Compile needed executables with -prod run: | @@ -172,9 +172,9 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - version: [linux, macos, windows] + version: [windows, linux, macos_arm64, macos_x86_64] steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Fetch artifacts uses: actions/download-artifact@v1 with: