From 3043847c84dcbb6b25505ecde5d0278eb0a056af Mon Sep 17 00:00:00 2001 From: Toby Davis Date: Sun, 22 Oct 2023 01:43:43 +0100 Subject: [PATCH 1/2] Merge from master --- librapid/vendor/xsimd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/librapid/vendor/xsimd b/librapid/vendor/xsimd index 6f8cc98a..bb9558c6 160000 --- a/librapid/vendor/xsimd +++ b/librapid/vendor/xsimd @@ -1 +1 @@ -Subproject commit 6f8cc98a979cdd271eb0d2a1fd754613ae52b327 +Subproject commit bb9558c6b75ed336dce0a6696dd4958131bcae02 From 25576a7bd3c91adebe572ee5b078f559e80bacf3 Mon Sep 17 00:00:00 2001 From: Toby Davis Date: Sun, 22 Oct 2023 16:56:27 +0100 Subject: [PATCH 2/2] Refactor CI scripts --- .github/workflows/continuous-integration.yaml | 1 + .github/workflows/create-release.yaml | 11 +++-------- .github/workflows/run-carbonate.yaml | 1 + .github/workflows/wheels.yaml | 1 + 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml index 649436a6..c25b8d64 100644 --- a/.github/workflows/continuous-integration.yaml +++ b/.github/workflows/continuous-integration.yaml @@ -8,6 +8,7 @@ on: branches: - "**" workflow_dispatch: + workflow_call: jobs: compile: diff --git a/.github/workflows/create-release.yaml b/.github/workflows/create-release.yaml index d4176bfa..68952af3 100644 --- a/.github/workflows/create-release.yaml +++ b/.github/workflows/create-release.yaml @@ -5,6 +5,7 @@ on: tags: - "v*" workflow_dispatch: + workflow_call: jobs: tagged-release: @@ -18,16 +19,10 @@ jobs: submodules: recursive - name: Check Compilation, Tests, Examples, Docs and Benchmarks - uses: actions/workflow-run-action@v2 - with: - workflow: "continuous-integration.yaml" - ref: ${{ github.ref }} + uses: ./.github/workflows/continuous-integration.yaml - name: Generate Python Wheels - uses: actions/workflow-run-action@v2 - with: - workflow: "wheels.yaml" - ref: ${{ github.ref }} + uses: ./.github/workflows/wheels.yaml - name: Zip Source Code run: | diff --git a/.github/workflows/run-carbonate.yaml b/.github/workflows/run-carbonate.yaml index e61afde4..6b4cdd87 100644 --- a/.github/workflows/run-carbonate.yaml +++ b/.github/workflows/run-carbonate.yaml @@ -3,6 +3,7 @@ on: types: [created] issues: types: [opened] + workflow_call: jobs: carbonate: diff --git a/.github/workflows/wheels.yaml b/.github/workflows/wheels.yaml index ce0f4e81..c0823fa4 100644 --- a/.github/workflows/wheels.yaml +++ b/.github/workflows/wheels.yaml @@ -9,6 +9,7 @@ on: branches: - "**" workflow_dispatch: + workflow_call: jobs: # Build the wheels for Linux, Windows and macOS for CPython 3.7 and newer