Skip to content

Commit 245df9e

Browse files
committed
working to fix CI
1 parent 7c2c93d commit 245df9e

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

.github/workflows/dependencies-macos.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ git clone --recursive https://github.com/mercury-hpc/mercury.git
1919
cd mercury
2020
git checkout v2.2.0
2121
mkdir build && cd build
22-
cmake ../ -DCMAKE_C_COMPILER=gcc -DBUILD_SHARED_LIBS=ON -DBUILD_TESTING=ON -DNA_USE_OFI=ON -DNA_USE_SM=OFF -DMERCURY_USE_CHECKSUMS=OFF -DNA_OFI_TESTING_PROTOCOL=sockets
22+
cmake ../ -DCMAKE_C_COMPILER=gcc -DBUILD_SHARED_LIBS=ON -DBUILD_TESTING=ON -DNA_USE_OFI=ON -DNA_USE_SM=OFF -DMERCURY_USE_CHECKSUMS=OFF -DNA_OFI_TESTING_PROTOCOL=sockets -DCMAKE_POLICY_VERSION_MINIMUM=3.5
2323
make -j2 && sudo make install
2424
ctest

.github/workflows/gitlab-stable.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
2323
- name: Update branch
2424
run: |
25-
git fetch stable
25+
git fetch origin stable
2626
git remote add gitlab https://${{ secrets.GITLAB_TOKEN_NAME }}:${{ secrets.GITLAB_TOKEN }}@${{ secrets.GITLAB_URL }}
2727
git checkout stable
2828
git push -f gitlab -u stable

.github/workflows/nersc.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
name: NERSC
22

33
on:
4-
pull_request_target
4+
pull_request
55

66
env:
77
PR_NUMBER: ${{ github.event.number }}
88

9+
concurrency:
10+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
11+
cancel-in-progress: true
12+
913
jobs:
1014
authorize:
11-
environment:
12-
${{ github.event_name == 'pull_request_target' && github.event.pull_request.head.repo.full_name != github.repository && 'external' || 'internal' }}
1315
runs-on: ubuntu-latest
1416
steps:
1517
- run: true
@@ -35,4 +37,4 @@ jobs:
3537
git fetch origin pull/${PR_NUMBER}/head:PR-${PR_SHA}
3638
git remote add gitlab https://${{ secrets.GITLAB_TOKEN_NAME }}:${{ secrets.GITLAB_TOKEN }}@${{ secrets.GITLAB_URL }}
3739
git checkout PR-${PR_SHA}
38-
git push -f gitlab -u PR-${PR_SHA}
40+
git push -f gitlab -u PR-${PR_SHA}

0 commit comments

Comments
 (0)