Skip to content

Commit

Permalink
Update host config (name only), nodejs 20, azure compiler versions
Browse files Browse the repository at this point in the history
  • Loading branch information
chapman39 committed Feb 21, 2024
1 parent 4944542 commit 44069a1
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 36 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/docker_build_tpls.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,20 +37,20 @@ jobs:
id: repo_name

- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Login to DockerHub
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Build and push
id: docker_build
uses: docker/build-push-action@v3
uses: docker/build-push-action@v4
with:
push: true
tags: ${{ steps.repo_name.outputs.repo_plus_tag }},${{ steps.repo_name.outputs.repo_plus_latest }}
Expand All @@ -69,7 +69,7 @@ jobs:
docker rm extract_hc
- name: Upload hostconfig
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ matrix.compiler }}_hostconfigs
path: ./extracted_hc/export_hostconfig/*
62 changes: 31 additions & 31 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,42 +6,42 @@
#

variables:
Clang_10_ImageName: 'seracllnl/tpls:clang-10_02-02-24_19h-41m'
GCC_11_ImageName: 'seracllnl/tpls:gcc-11_02-02-24_19h-41m'
Clang_15_ImageName: 'seracllnl/tpls:clang-15_02-21-24_01h-18m'
GCC_13_ImageName: 'seracllnl/tpls:gcc-13_02-21-24_01h-18m'

jobs:
- job: Build_and_Test
strategy:
matrix:
linux_gcc11_debug:
VM_ImageName: 'ubuntu-20.04'
Compiler_ImageName: $(GCC_11_ImageName)
TEST_TARGET: 'linux_gcc11'
HOST_CONFIG: 'gcc@11.1.0.cmake'
linux_gcc13_debug:
VM_ImageName: 'ubuntu-22.04'
Compiler_ImageName: $(GCC_13_ImageName)
TEST_TARGET: 'linux_gcc13'
HOST_CONFIG: 'gcc@13.1.0.cmake'
BUILD_TYPE: 'Debug'
linux_gcc11_release:
VM_ImageName: 'ubuntu-20.04'
Compiler_ImageName: $(GCC_11_ImageName)
TEST_TARGET: 'linux_gcc11'
HOST_CONFIG: 'gcc@11.1.0.cmake'
linux_gcc13_release:
VM_ImageName: 'ubuntu-22.04'
Compiler_ImageName: $(GCC_13_ImageName)
TEST_TARGET: 'linux_gcc13'
HOST_CONFIG: 'gcc@13.1.0.cmake'
BUILD_TYPE: 'Release'
linux_clang10_debug:
VM_ImageName: 'ubuntu-20.04'
Compiler_ImageName: $(Clang_10_ImageName)
TEST_TARGET: 'linux_clang10'
HOST_CONFIG: 'clang@10.0.0.cmake'
linux_clang15_debug:
VM_ImageName: 'ubuntu-22.04'
Compiler_ImageName: $(Clang_15_ImageName)
TEST_TARGET: 'linux_clang15'
HOST_CONFIG: 'clang@15.0.7.cmake'
BUILD_TYPE: 'Debug'
linux_clang10_release:
VM_ImageName: 'ubuntu-20.04'
Compiler_ImageName: $(Clang_10_ImageName)
TEST_TARGET: 'linux_clang10'
HOST_CONFIG: 'clang@10.0.0.cmake'
linux_clang15_release:
VM_ImageName: 'ubuntu-22.04'
Compiler_ImageName: $(Clang_15_ImageName)
TEST_TARGET: 'linux_clang15'
HOST_CONFIG: 'clang@15.0.7.cmake'
BUILD_TYPE: 'Release'
linux_clang10_codevelop:
VM_ImageName: 'ubuntu-20.04'
Compiler_ImageName: $(Clang_10_ImageName)
TEST_TARGET: 'linux_clang10'
HOST_CONFIG: 'clang@10.0.0.cmake'
linux_clang15_codevelop:
VM_ImageName: 'ubuntu-22.04'
Compiler_ImageName: $(Clang_15_ImageName)
TEST_TARGET: 'linux_clang15'
HOST_CONFIG: 'clang@15.0.7.cmake'
BUILD_TYPE: 'Debug'
CMAKE_OPTS: '-DSERAC_ENABLE_CODEVELOP=ON'
BUILD_SRC_OPTS: '--skip-install'
Expand All @@ -67,10 +67,10 @@ jobs:

- job: Check_Code
variables:
VM_ImageName: 'ubuntu-20.04'
Compiler_ImageName: $(Clang_10_ImageName)
TEST_TARGET: 'linux_clang10'
HOST_CONFIG: 'clang@10.0.0.cmake'
VM_ImageName: 'ubuntu-22.04'
Compiler_ImageName: $(Clang_15_ImageName)
TEST_TARGET: 'linux_clang15'
HOST_CONFIG: 'clang@15.0.7.cmake'

strategy:
matrix:
Expand Down
File renamed without changes.
File renamed without changes.

0 comments on commit 44069a1

Please sign in to comment.