Skip to content

Commit

Permalink
Merge pull request #101 from oneapi-src/fixes_ci
Browse files Browse the repository at this point in the history
Updates for circle ci containers and gh actions
  • Loading branch information
hjroblesg authored Oct 31, 2024
2 parents 2ca369f + 580e8f5 commit 7a57a32
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 42 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@ jobs:

build_linux_container_cpp:
docker:
- image: intel/oneapi-hpckit
- image: intel/hpckit
steps:
- run:
name: install_git
Expand All @@ -495,7 +495,7 @@ jobs:

build_linux_container_fortran:
docker:
- image: intel/oneapi-hpckit
- image: intel/hpckit
steps:
- run:
name: install_git
Expand Down
50 changes: 25 additions & 25 deletions .github/workflows/build_all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ jobs:
run:
shell: bash
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: cache install
id: cache-install
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: |
C:\Program Files (x86)\Intel\oneAPI\setvars-vcvarsall.bat
Expand Down Expand Up @@ -73,10 +73,10 @@ jobs:
run:
shell: bash
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: cache install
id: cache-install
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: |
C:\Program Files (x86)\Intel\oneAPI\setvars-vcvarsall.bat
Expand Down Expand Up @@ -110,10 +110,10 @@ jobs:
run:
shell: bash
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: cache install
id: cache-install
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: |
C:\Program Files (x86)\Intel\oneAPI\setvars-vcvarsall.bat
Expand Down Expand Up @@ -152,10 +152,10 @@ jobs:
run:
shell: bash
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: cache install
id: cache-install
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: |
/opt/intel/oneapi/compiler
Expand Down Expand Up @@ -186,10 +186,10 @@ jobs:
run:
shell: bash
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: cache install
id: cache-install
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: |
/opt/intel/oneapi/compiler
Expand Down Expand Up @@ -220,10 +220,10 @@ jobs:
run:
shell: bash
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: cache install
id: cache-install
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: |
/opt/intel/oneapi/compiler
Expand Down Expand Up @@ -255,7 +255,7 @@ jobs:
run:
shell: bash
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: install
run: scripts/install_linux_aitools.sh $LINUX_AIKIT_URL
- name: build
Expand All @@ -278,14 +278,14 @@ jobs:
run:
shell: bash
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: setup apt repo
run: scripts/setup_apt_repo_linux.sh
- name: collect versioned dependencies of apt packages
run: scripts/apt_depends.sh $LINUX_CPP_COMPONENTS | tee depends.txt
- name: cache install
id: cache-install
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: |
/opt/intel/oneapi/compiler
Expand All @@ -305,14 +305,14 @@ jobs:
run:
shell: bash
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: setup apt repo
run: scripts/setup_apt_repo_linux.sh
- name: collect versioned dependencies of apt packages
run: scripts/apt_depends.sh $LINUX_FORTRAN_COMPONENTS | tee depends.txt
- name: cache install
id: cache-install
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: |
/opt/intel/oneapi/compiler
Expand All @@ -332,14 +332,14 @@ jobs:
run:
shell: bash
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: setup apt repo
run: scripts/setup_apt_repo_linux.sh
- name: collect versioned dependencies of apt packages
run: scripts/apt_depends.sh $LINUX_DPCPP_COMPONENTS | tee depends.txt
- name: cache install
id: cache-install
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: |
/opt/intel/oneapi/compiler
Expand All @@ -361,7 +361,7 @@ jobs:
run:
shell: bash
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: install prerequisites
run: scripts/install_prerequisites_linux_dnf.sh
- name: setup yum/dnf repo
Expand All @@ -370,7 +370,7 @@ jobs:
run: scripts/dnf_depends.sh $LINUX_CPP_COMPONENTS | tee depends.txt
- name: cache install
id: cache-install
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: |
/opt/intel/oneapi/compiler
Expand All @@ -391,7 +391,7 @@ jobs:
run:
shell: bash
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: install prerequisites
run: scripts/install_prerequisites_linux_dnf.sh
- name: setup yum/dnf repo
Expand All @@ -400,7 +400,7 @@ jobs:
run: scripts/dnf_depends.sh $LINUX_FORTRAN_COMPONENTS | tee depends.txt
- name: cache install
id: cache-install
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: |
/opt/intel/oneapi/compiler
Expand All @@ -421,7 +421,7 @@ jobs:
run:
shell: bash
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: install prerequisites
run: scripts/install_prerequisites_linux_dnf.sh
- name: setup yum/dnf repo
Expand All @@ -430,7 +430,7 @@ jobs:
run: scripts/dnf_depends.sh $LINUX_DPCPP_COMPONENTS | tee depends.txt
- name: cache install
id: cache-install
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: |
/opt/intel/oneapi/compiler
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ jobs:
checks:
runs-on: Ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- uses: actions/checkout@v3
- uses: actions/setup-python@v3
- name: Install prerequisites
run: |
sudo apt-get install -qq clang-format
Expand Down
26 changes: 13 additions & 13 deletions .github/workflows/list_components.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ jobs:
run:
shell: bash
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- uses: actions/checkout@v3
- uses: actions/setup-python@v3
with:
python-version: '3.x'
- name: Intel® oneAPI Base Toolkit
Expand All @@ -46,8 +46,8 @@ jobs:
run:
shell: bash
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- uses: actions/checkout@v3
- uses: actions/setup-python@v3
with:
python-version: '3.x'
- name: Intel® oneAPI Base Toolkit
Expand All @@ -66,8 +66,8 @@ jobs:
run:
shell: bash
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- uses: actions/checkout@v3
- uses: actions/setup-python@v3
with:
python-version: '3.x'
- name: Intel® AI Tools Toolkit
Expand All @@ -84,8 +84,8 @@ jobs:
run:
shell: bash
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- uses: actions/checkout@v3
- uses: actions/setup-python@v3
with:
python-version: '3.x'
- name: setup apt repo
Expand All @@ -106,8 +106,8 @@ jobs:
run:
shell: bash
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- uses: actions/checkout@v3
- uses: actions/setup-python@v3
with:
python-version: '3.x'
- name: setup yum/dnf repo
Expand All @@ -133,7 +133,7 @@ jobs:
shell: bash
working-directory: doc
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Download artifacts - windows
uses: actions/download-artifact@v3
with:
Expand All @@ -159,7 +159,7 @@ jobs:
with:
name: linux_aitools
path: doc/source/${{ github.workflow }}
- uses: actions/setup-python@v2
- uses: actions/setup-python@v3
with:
python-version: '3.x'
- name: Install prerequisites
Expand All @@ -177,7 +177,7 @@ jobs:
path: doc/build
- name: Checkout gh-pages
if: ${{ github.ref == 'refs/heads/master' }}
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
ref: gh-pages
path: gh-pages
Expand Down

0 comments on commit 7a57a32

Please sign in to comment.