Skip to content

Commit 8aa21ae

Browse files
authored
Merge pull request #41 from JohanMabille/fix_gha
Fixed GHA
2 parents 12838d3 + 55a73cb commit 8aa21ae

File tree

3 files changed

+13
-6
lines changed

3 files changed

+13
-6
lines changed

.github/workflows/unix_impl.yml renamed to .github/actions/unix_impl/action.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
name: "Common steps for Linux and OSX"
22
runs:
3+
using: "composite"
34
steps:
4-
- name: Checkout code
5-
uses: actions/checkout@v3
6-
75
- name: Set conda environment
86
uses: mamba-org/setup-micromamba@v2
97
with:
@@ -23,10 +21,12 @@ runs:
2321
else
2422
micromamba install xtensor-r==0.14.0 -c conda-forge;
2523
fi
24+
shell: bash -e -l {0}
2625

2726
- name: Build Xtensor.R package
2827
run: |
2928
R CMD build ${{ github.workspace }};
29+
shell: bash -e -l {0}
3030

3131
- name: Check R package
3232
run: |
@@ -47,3 +47,4 @@ runs:
4747
cat xtensor.Rcheck/Rdlatex.log
4848
);
4949
fi
50+
shell: bash -e -l {0}

.github/workflows/linux.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- {compiler: gcc, version: '12', novendor: 1}
2727
- {compiler: gcc, version: '13', novendor: 1}
2828
- {compiler: gcc, version: '14', novendor: 1}
29-
#- {compiler: clang, version: '19'}
29+
- {compiler: clang, version: '19'}
3030
- {compiler: clang, version: '20'}
3131

3232
steps:
@@ -52,6 +52,9 @@ jobs:
5252
sudo update-alternatives --set clang++ /usr/bin/clang++-${{matrix.sys.version}}
5353
sudo update-alternatives --set clang-scan-deps /usr/bin/clang-scan-deps-${{matrix.sys.version}}
5454
55+
- name: Checkout code
56+
uses: actions/checkout@v4
57+
5558
- name: Build and run tests
56-
uses: ./.github/workflows/unix_impl.yml
59+
uses: ./.github/actions/unix_impl
5760

.github/workflows/osx.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ jobs:
2323

2424
steps:
2525

26+
- name: Checkout code
27+
uses: actions/checkout@v4
28+
2629
- name: Build and run tests
27-
uses: ./.github/workflows/unix_impl.yml
30+
uses: ./.github/actions/unix_impl
2831

0 commit comments

Comments
 (0)