Skip to content

Commit 8b55983

Browse files
committed
Revert "OneAPI test."
This reverts commit eb7685d.
1 parent 80266a3 commit 8b55983

File tree

2 files changed

+0
-203
lines changed

2 files changed

+0
-203
lines changed

.github/workflows/daily-build.yml

Lines changed: 0 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
<<<<<<< HEAD
2-
name: hdf5 dev daily build
3-
4-
# Triggers the workflow on a schedule or on demand
5-
on:
6-
workflow_dispatch:
7-
schedule:
8-
- cron: "6 0 * * *"
9-
=======
101
name: hdf5 1.14 daily build
112

123
# Triggers the workflow on demand or on a call from another workflow
@@ -26,7 +17,6 @@ on:
2617
type: string
2718
required: false
2819
default: check
29-
>>>>>>> 7bf340440909d468dbb3cf41f0ea0d87f5050cea
3020

3121
permissions:
3222
contents: read
@@ -36,42 +26,24 @@ jobs:
3626
runs-on: ubuntu-latest
3727
outputs:
3828
hdf5-name: ${{ steps.gethdf5base.outputs.HDF5_NAME_BASE }}
39-
<<<<<<< HEAD
40-
=======
4129
run-ignore: ${{ steps.getinputs.outputs.INPUTS_IGNORE }}
42-
>>>>>>> 7bf340440909d468dbb3cf41f0ea0d87f5050cea
4330

4431
steps:
4532
- uses: actions/[email protected]
4633

4734
- name: Get hdf5 release base name
4835
uses: dsaltares/fetch-gh-release-asset@master
4936
with:
50-
<<<<<<< HEAD
51-
version: 'tags/snapshot'
52-
file: 'last-file.txt'
53-
=======
5437
version: 'tags/snapshot-1.14'
5538
file: 'last-file.txt'
5639
continue-on-error: true
57-
>>>>>>> 7bf340440909d468dbb3cf41f0ea0d87f5050cea
5840

5941
- name: Read base-name file
6042
id: gethdf5base
6143
run: echo "HDF5_NAME_BASE=$(cat last-file.txt)" >> $GITHUB_OUTPUT
6244

6345
- run: echo "hdf5 base name is ${{ steps.gethdf5base.outputs.HDF5_NAME_BASE }}."
6446

65-
<<<<<<< HEAD
66-
call-workflow-tarball:
67-
uses: ./.github/workflows/tarball.yml
68-
with:
69-
use_tag: snapshot
70-
use_environ: snapshots
71-
72-
call-workflow-ctest:
73-
needs: call-workflow-tarball
74-
=======
7547
- name: Read inputs
7648
id: getinputs
7749
run: |
@@ -132,53 +104,33 @@ jobs:
132104

133105
call-workflow-ctest:
134106
needs: [get-old-names, call-workflow-tarball]
135-
>>>>>>> 7bf340440909d468dbb3cf41f0ea0d87f5050cea
136107
uses: ./.github/workflows/cmake-ctest.yml
137108
with:
138109
preset_name: ci-StdShar
139110
file_base: ${{ needs.call-workflow-tarball.outputs.file_base }}
140-
<<<<<<< HEAD
141-
# use_tag: snapshot
142-
use_environ: snapshots
143-
secrets:
144-
=======
145111
#use_tag: snapshot-1.14
146112
use_environ: snapshots
147113
secrets:
148114
APPLE_CERTS_BASE64: ${{ secrets.APPLE_CERTS_BASE64 }}
149115
APPLE_CERTS_BASE64_PASSWD: ${{ secrets.APPLE_CERTS_BASE64_PASSWD }}
150116
KEYCHAIN_PASSWD: ${{ secrets.KEYCHAIN_PASSWD }}
151-
>>>>>>> 7bf340440909d468dbb3cf41f0ea0d87f5050cea
152117
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
153118
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
154119
AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
155120
AZURE_ENDPOINT: ${{ secrets.AZURE_ENDPOINT }}
156121
AZURE_CODE_SIGNING_NAME: ${{ secrets.AZURE_CODE_SIGNING_NAME }}
157122
AZURE_CERT_PROFILE_NAME: ${{ secrets.AZURE_CERT_PROFILE_NAME }}
158-
<<<<<<< HEAD
159-
if: ${{ needs.call-workflow-tarball.outputs.has_changes == 'true' }}
160-
161-
call-workflow-abi:
162-
needs: [call-workflow-tarball, call-workflow-ctest]
163-
=======
164123
if: ${{ ((needs.call-workflow-tarball.outputs.has_changes == 'true') || (needs.get-old-names.outputs.run-ignore == 'ignore')) }}
165124

166125
call-workflow-abi:
167126
needs: [get-old-names, call-workflow-tarball, call-workflow-ctest]
168-
>>>>>>> 7bf340440909d468dbb3cf41f0ea0d87f5050cea
169127
uses: ./.github/workflows/abi-report.yml
170128
with:
171129
file_ref: '1.14.4.3'
172130
file_base: ${{ needs.call-workflow-tarball.outputs.file_base }}
173-
<<<<<<< HEAD
174-
use_tag: snapshot
175-
use_environ: snapshots
176-
if: ${{ needs.call-workflow-tarball.outputs.has_changes == 'true' }}
177-
=======
178131
use_tag: snapshot-1.14
179132
use_environ: snapshots
180133
if: ${{ ((needs.call-workflow-tarball.outputs.has_changes == 'true') || (needs.get-old-names.outputs.run-ignore == 'ignore')) }}
181-
>>>>>>> 7bf340440909d468dbb3cf41f0ea0d87f5050cea
182134

183135
call-workflow-release:
184136
needs: [get-old-names, call-workflow-tarball, call-workflow-ctest, call-workflow-abi]
@@ -189,15 +141,9 @@ jobs:
189141
file_base: ${{ needs.call-workflow-tarball.outputs.file_base }}
190142
file_branch: ${{ needs.call-workflow-tarball.outputs.file_branch }}
191143
file_sha: ${{ needs.call-workflow-tarball.outputs.file_sha }}
192-
<<<<<<< HEAD
193-
use_tag: snapshot
194-
use_environ: snapshots
195-
if: ${{ needs.call-workflow-tarball.outputs.has_changes == 'true' }}
196-
=======
197144
use_tag: snapshot-1.14
198145
use_environ: snapshots
199146
if: ${{ ((needs.call-workflow-tarball.outputs.has_changes == 'true') || (needs.get-old-names.outputs.run-ignore == 'ignore')) }}
200-
>>>>>>> 7bf340440909d468dbb3cf41f0ea0d87f5050cea
201147

202148
call-workflow-remove:
203149
needs: [get-old-names, call-workflow-tarball, call-workflow-ctest, call-workflow-abi, call-workflow-release]
@@ -206,13 +152,7 @@ jobs:
206152
uses: ./.github/workflows/remove-files.yml
207153
with:
208154
file_base: ${{ needs.get-old-names.outputs.hdf5-name }}
209-
<<<<<<< HEAD
210-
use_tag: snapshot
211-
use_environ: snapshots
212-
if: ${{ (needs.call-workflow-tarball.outputs.has_changes == 'true') && (needs.get-old-names.outputs.hdf5-name != needs.call-workflow-tarball.outputs.file_base) }}
213-
=======
214155
use_tag: snapshot-1.14
215156
use_environ: snapshots
216157
if: ${{ ((needs.call-workflow-tarball.outputs.has_changes == 'true') || (needs.get-old-names.outputs.run-ignore == 'ignore')) && (needs.get-old-names.outputs.hdf5-name != needs.call-workflow-tarball.outputs.file_base) }}
217-
>>>>>>> 7bf340440909d468dbb3cf41f0ea0d87f5050cea
218158

.github/workflows/oneapi-par.yml

Lines changed: 0 additions & 143 deletions
This file was deleted.

0 commit comments

Comments
 (0)