From c8a6ae0f05579b3bf079b4bcf38474530d0b3b87 Mon Sep 17 00:00:00 2001 From: Gabriele Picco Date: Mon, 26 Feb 2024 12:01:50 +0100 Subject: [PATCH] :green_heart: Fix CI/CD --- .github/workflows/publish-packages.yml | 60 +++++++++++++------------- .github/workflows/run-tests.yml | 5 +-- 2 files changed, 31 insertions(+), 34 deletions(-) diff --git a/.github/workflows/publish-packages.yml b/.github/workflows/publish-packages.yml index 2d5da13..bf5030a 100644 --- a/.github/workflows/publish-packages.yml +++ b/.github/workflows/publish-packages.yml @@ -20,24 +20,24 @@ jobs: fail-fast: false matrix: build: -# - { -# NAME: linux-x64-glibc, -# OS: ubuntu-20.04, -# TOOLCHAIN: stable, -# TARGET: x86_64-unknown-linux-gnu, -# } -# - { -# NAME: linux-x86-glibc, -# OS: ubuntu-22.04, -# TOOLCHAIN: stable, -# TARGET: i686-unknown-linux-gnu, -# } -# - { -# NAME: linux-arm64-glibc, -# OS: ubuntu-20.04, -# TOOLCHAIN: stable, -# TARGET: aarch64-unknown-linux-gnu, -# } + - { + NAME: linux-x64-glibc, + OS: ubuntu-20.04, + TOOLCHAIN: stable, + TARGET: x86_64-unknown-linux-gnu, + } + - { + NAME: linux-x86-glibc, + OS: ubuntu-22.04, + TOOLCHAIN: stable, + TARGET: i686-unknown-linux-gnu, + } + - { + NAME: linux-arm64-glibc, + OS: ubuntu-20.04, + TOOLCHAIN: stable, + TARGET: aarch64-unknown-linux-gnu, + } - { NAME: win32-x64-msvc, OS: windows-2022, @@ -50,18 +50,18 @@ jobs: TOOLCHAIN: stable, TARGET: i686-pc-windows-msvc, } -# - { -# NAME: darwin-x64, -# OS: macos-11, -# TOOLCHAIN: stable, -# TARGET: x86_64-apple-darwin, -# } -# - { -# NAME: darwin-arm64, -# OS: macos-11, -# TOOLCHAIN: stable, -# TARGET: aarch64-apple-darwin, -# } + - { + NAME: darwin-x64, + OS: macos-11, + TOOLCHAIN: stable, + TARGET: x86_64-apple-darwin, + } + - { + NAME: darwin-arm64, + OS: macos-11, + TOOLCHAIN: stable, + TARGET: aarch64-apple-darwin, + } steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 99a12e7..b51b457 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -104,6 +104,7 @@ jobs: - uses: actions/checkout@v4 - name: Set ON_RELEASE_BRANCH based on trigger + shell: bash run: echo "ON_RELEASE_BRANCH=true" >> $GITHUB_ENV if: github.event_name == 'push' && startsWith(github.ref, 'refs/heads/release/v') @@ -167,10 +168,6 @@ jobs: npm i -g @coral-xyz/anchor-cli@${{ env.anchor_version }} ts-mocha typescript anchor test - - name: Print github.ref - shell: bash - run: echo "The current github.ref is $GITHUB_REF" - - name: Install the Bolt CLI and create & build a new project shell: bash if: ${{ env.ON_RELEASE_BRANCH != 'true' }}