Skip to content

Commit

Permalink
Merge pull request #2316 from DARMA-tasking/2312-fix-ci-warnings
Browse files Browse the repository at this point in the history
#2312: Update CI jobs to resolve all warnings.
  • Loading branch information
nlslatt authored Jul 11, 2024
2 parents ed79a65 + 4a695ef commit 4d44a33
Show file tree
Hide file tree
Showing 28 changed files with 131 additions and 83 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ jobs:
TOKEN: ${{ secrets.GH_PAT }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Build the Docker image
run: docker-compose run ubuntu-docs
run: docker compose run ubuntu-docs
2 changes: 1 addition & 1 deletion .github/workflows/build-statistics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Generate build stats
uses: DARMA-tasking/build-stats@master
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-commit-format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
name: Check commit
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
ref: ${{ github.event.pull_request.head.sha }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/check-include-guards-and-license.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ jobs:
steps:

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

- name: Setup Dependencies
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: '3.7'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-trailing-whitespace.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
name: Find Trailing Whitespace
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: DARMA-tasking/find-trailing-whitespace@master
with:
exclude: "sketches;lib"
6 changes: 3 additions & 3 deletions .github/workflows/macosx-clang-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@ jobs:
CMAKE_BUILD_PARALLEL_LEVEL: 4

steps:
- uses: actions/checkout@v3
- uses: actions/cache@v3
- uses: actions/checkout@v4
- uses: actions/cache@v4
with:
path: ~/.ccache
key: ${{ runner.os }}-macosx-clang-14-ccache-${{ secrets.GH_ACTIONS_CACHE_VERSION }}-${{ hashFiles('**/*') }}
restore-keys: |
${{ runner.os }}-macosx-clang-14-ccache-${{ secrets.GH_ACTIONS_CACHE_VERSION }}
- uses: actions/cache@v3
- uses: actions/cache@v4
id: mpich-cache
with:
path: ~/.mpich
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pushdockerimage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Docker Build & Push
uses: jerray/publish-docker-action@master
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run-git-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
name: Run git check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
ref: ${{ github.event.pull_request.head.sha }}
Expand Down
9 changes: 6 additions & 3 deletions ci/azure/azure-clang-10-ubuntu-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -131,16 +131,18 @@ stages:
script: |
val=$(./scripts/check_containers.sh)
echo "##vso[task.setvariable variable=compose_command]$val"
- task: DockerCompose@0
- task: DockerCompose@1
displayName: Pull container
inputs:
projectName: darma-tasking-vt
containerregistrytype: 'Container Registry'
dockerComposeFile: '**/docker-compose.yml'
action: 'Run a Docker Compose command'
dockerComposeCommand: '$(compose_command) ubuntu-cpp-clean'
- task: DockerCompose@0
- task: DockerCompose@1
displayName: Build container
inputs:
projectName: darma-tasking-vt
containerregistrytype: 'Container Registry'
dockerComposeFile: '**/docker-compose.yml'
action: 'Run a Docker Compose command'
Expand All @@ -166,11 +168,12 @@ stages:
"$(Agent.JobStatus)"
env:
GITHUB_PAT: $(github_pat)
- task: DockerCompose@0
- task: DockerCompose@1
displayName: Push container to registry
continueOnError: true
condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop'))
inputs:
projectName: darma-tasking-vt
containerregistrytype: 'Container Registry'
dockerRegistryEndpoint: 'dockerRegistryConnection1'
dockerComposeFile: '**/docker-compose.yml'
Expand Down
9 changes: 6 additions & 3 deletions ci/azure/azure-clang-11-ubuntu-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -131,16 +131,18 @@ stages:
script: |
val=$(./scripts/check_containers.sh)
echo "##vso[task.setvariable variable=compose_command]$val"
- task: DockerCompose@0
- task: DockerCompose@1
displayName: Pull container
inputs:
projectName: darma-tasking-vt
containerregistrytype: 'Container Registry'
dockerComposeFile: '**/docker-compose.yml'
action: 'Run a Docker Compose command'
dockerComposeCommand: '$(compose_command) ubuntu-cpp-clean'
- task: DockerCompose@0
- task: DockerCompose@1
displayName: Build container
inputs:
projectName: darma-tasking-vt
containerregistrytype: 'Container Registry'
dockerComposeFile: '**/docker-compose.yml'
action: 'Run a Docker Compose command'
Expand All @@ -166,11 +168,12 @@ stages:
"$(Agent.JobStatus)"
env:
GITHUB_PAT: $(github_pat)
- task: DockerCompose@0
- task: DockerCompose@1
displayName: Push container to registry
continueOnError: true
condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop'))
inputs:
projectName: darma-tasking-vt
containerregistrytype: 'Container Registry'
dockerRegistryEndpoint: 'dockerRegistryConnection1'
dockerComposeFile: '**/docker-compose.yml'
Expand Down
9 changes: 6 additions & 3 deletions ci/azure/azure-clang-12-ubuntu-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -131,16 +131,18 @@ stages:
script: |
val=$(./scripts/check_containers.sh)
echo "##vso[task.setvariable variable=compose_command]$val"
- task: DockerCompose@0
- task: DockerCompose@1
displayName: Pull container
inputs:
projectName: darma-tasking-vt
containerregistrytype: 'Container Registry'
dockerComposeFile: '**/docker-compose.yml'
action: 'Run a Docker Compose command'
dockerComposeCommand: '$(compose_command) ubuntu-cpp-clean'
- task: DockerCompose@0
- task: DockerCompose@1
displayName: Build container
inputs:
projectName: darma-tasking-vt
containerregistrytype: 'Container Registry'
dockerComposeFile: '**/docker-compose.yml'
action: 'Run a Docker Compose command'
Expand All @@ -166,11 +168,12 @@ stages:
"$(Agent.JobStatus)"
env:
GITHUB_PAT: $(github_pat)
- task: DockerCompose@0
- task: DockerCompose@1
displayName: Push container to registry
continueOnError: true
condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop'))
inputs:
projectName: darma-tasking-vt
containerregistrytype: 'Container Registry'
dockerRegistryEndpoint: 'dockerRegistryConnection1'
dockerComposeFile: '**/docker-compose.yml'
Expand Down
9 changes: 6 additions & 3 deletions ci/azure/azure-clang-13-ubuntu-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -131,16 +131,18 @@ stages:
script: |
val=$(./scripts/check_containers.sh)
echo "##vso[task.setvariable variable=compose_command]$val"
- task: DockerCompose@0
- task: DockerCompose@1
displayName: Pull container
inputs:
projectName: darma-tasking-vt
containerregistrytype: 'Container Registry'
dockerComposeFile: '**/docker-compose.yml'
action: 'Run a Docker Compose command'
dockerComposeCommand: '$(compose_command) ubuntu-cpp-clean'
- task: DockerCompose@0
- task: DockerCompose@1
displayName: Build container
inputs:
projectName: darma-tasking-vt
containerregistrytype: 'Container Registry'
dockerComposeFile: '**/docker-compose.yml'
action: 'Run a Docker Compose command'
Expand All @@ -166,11 +168,12 @@ stages:
"$(Agent.JobStatus)"
env:
GITHUB_PAT: $(github_pat)
- task: DockerCompose@0
- task: DockerCompose@1
displayName: Push container to registry
continueOnError: true
condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop'))
inputs:
projectName: darma-tasking-vt
containerregistrytype: 'Container Registry'
dockerRegistryEndpoint: 'dockerRegistryConnection1'
dockerComposeFile: '**/docker-compose.yml'
Expand Down
9 changes: 6 additions & 3 deletions ci/azure/azure-clang-14-ubuntu-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -131,16 +131,18 @@ stages:
script: |
val=$(./scripts/check_containers.sh)
echo "##vso[task.setvariable variable=compose_command]$val"
- task: DockerCompose@0
- task: DockerCompose@1
displayName: Pull container
inputs:
projectName: darma-tasking-vt
containerregistrytype: 'Container Registry'
dockerComposeFile: '**/docker-compose.yml'
action: 'Run a Docker Compose command'
dockerComposeCommand: '$(compose_command) ubuntu-cpp-clean'
- task: DockerCompose@0
- task: DockerCompose@1
displayName: Build container
inputs:
projectName: darma-tasking-vt
containerregistrytype: 'Container Registry'
dockerComposeFile: '**/docker-compose.yml'
action: 'Run a Docker Compose command'
Expand All @@ -166,11 +168,12 @@ stages:
"$(Agent.JobStatus)"
env:
GITHUB_PAT: $(github_pat)
- task: DockerCompose@0
- task: DockerCompose@1
displayName: Push container to registry
continueOnError: true
condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop'))
inputs:
projectName: darma-tasking-vt
containerregistrytype: 'Container Registry'
dockerRegistryEndpoint: 'dockerRegistryConnection1'
dockerComposeFile: '**/docker-compose.yml'
Expand Down
9 changes: 6 additions & 3 deletions ci/azure/azure-clang-9-ubuntu-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -131,16 +131,18 @@ stages:
script: |
val=$(./scripts/check_containers.sh)
echo "##vso[task.setvariable variable=compose_command]$val"
- task: DockerCompose@0
- task: DockerCompose@1
displayName: Pull container
inputs:
projectName: darma-tasking-vt
containerregistrytype: 'Container Registry'
dockerComposeFile: '**/docker-compose.yml'
action: 'Run a Docker Compose command'
dockerComposeCommand: '$(compose_command) ubuntu-cpp-clean'
- task: DockerCompose@0
- task: DockerCompose@1
displayName: Build container
inputs:
projectName: darma-tasking-vt
containerregistrytype: 'Container Registry'
dockerComposeFile: '**/docker-compose.yml'
action: 'Run a Docker Compose command'
Expand All @@ -166,11 +168,12 @@ stages:
"$(Agent.JobStatus)"
env:
GITHUB_PAT: $(github_pat)
- task: DockerCompose@0
- task: DockerCompose@1
displayName: Push container to registry
continueOnError: true
condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop'))
inputs:
projectName: darma-tasking-vt
containerregistrytype: 'Container Registry'
dockerRegistryEndpoint: 'dockerRegistryConnection1'
dockerComposeFile: '**/docker-compose.yml'
Expand Down
9 changes: 6 additions & 3 deletions ci/azure/azure-clang-alpine-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -131,16 +131,18 @@ stages:
script: |
val=$(./scripts/check_containers.sh)
echo "##vso[task.setvariable variable=compose_command]$val"
- task: DockerCompose@0
- task: DockerCompose@1
displayName: Pull container
inputs:
projectName: darma-tasking-vt
containerregistrytype: 'Container Registry'
dockerComposeFile: '**/docker-compose.yml'
action: 'Run a Docker Compose command'
dockerComposeCommand: '$(compose_command) alpine-cpp-clean'
- task: DockerCompose@0
- task: DockerCompose@1
displayName: Build container
inputs:
projectName: darma-tasking-vt
containerregistrytype: 'Container Registry'
dockerComposeFile: '**/docker-compose.yml'
action: 'Run a Docker Compose command'
Expand All @@ -166,11 +168,12 @@ stages:
"$(Agent.JobStatus)"
env:
GITHUB_PAT: $(github_pat)
- task: DockerCompose@0
- task: DockerCompose@1
displayName: Push container to registry
continueOnError: true
condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop'))
inputs:
projectName: darma-tasking-vt
containerregistrytype: 'Container Registry'
dockerRegistryEndpoint: 'dockerRegistryConnection1'
dockerComposeFile: '**/docker-compose.yml'
Expand Down
9 changes: 6 additions & 3 deletions ci/azure/azure-gcc-10-ubuntu-openmpi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -131,16 +131,18 @@ stages:
script: |
val=$(./scripts/check_containers.sh)
echo "##vso[task.setvariable variable=compose_command]$val"
- task: DockerCompose@0
- task: DockerCompose@1
displayName: Pull container
inputs:
projectName: darma-tasking-vt
containerregistrytype: 'Container Registry'
dockerComposeFile: '**/docker-compose.yml'
action: 'Run a Docker Compose command'
dockerComposeCommand: '$(compose_command) ubuntu-cpp-clean-openmpi'
- task: DockerCompose@0
- task: DockerCompose@1
displayName: Build container
inputs:
projectName: darma-tasking-vt
containerregistrytype: 'Container Registry'
dockerComposeFile: '**/docker-compose.yml'
action: 'Run a Docker Compose command'
Expand All @@ -166,11 +168,12 @@ stages:
"$(Agent.JobStatus)"
env:
GITHUB_PAT: $(github_pat)
- task: DockerCompose@0
- task: DockerCompose@1
displayName: Push container to registry
continueOnError: true
condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop'))
inputs:
projectName: darma-tasking-vt
containerregistrytype: 'Container Registry'
dockerRegistryEndpoint: 'dockerRegistryConnection1'
dockerComposeFile: '**/docker-compose.yml'
Expand Down
9 changes: 6 additions & 3 deletions ci/azure/azure-gcc-11-ubuntu-mpich.yml
Original file line number Diff line number Diff line change
Expand Up @@ -131,16 +131,18 @@ stages:
script: |
val=$(./scripts/check_containers.sh)
echo "##vso[task.setvariable variable=compose_command]$val"
- task: DockerCompose@0
- task: DockerCompose@1
displayName: Pull container
inputs:
projectName: darma-tasking-vt
containerregistrytype: 'Container Registry'
dockerComposeFile: '**/docker-compose.yml'
action: 'Run a Docker Compose command'
dockerComposeCommand: '$(compose_command) ubuntu-cpp-clean-noinstall'
- task: DockerCompose@0
- task: DockerCompose@1
displayName: Build container
inputs:
projectName: darma-tasking-vt
containerregistrytype: 'Container Registry'
dockerComposeFile: '**/docker-compose.yml'
action: 'Run a Docker Compose command'
Expand All @@ -166,11 +168,12 @@ stages:
"$(Agent.JobStatus)"
env:
GITHUB_PAT: $(github_pat)
- task: DockerCompose@0
- task: DockerCompose@1
displayName: Push container to registry
continueOnError: true
condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/develop'))
inputs:
projectName: darma-tasking-vt
containerregistrytype: 'Container Registry'
dockerRegistryEndpoint: 'dockerRegistryConnection1'
dockerComposeFile: '**/docker-compose.yml'
Expand Down
Loading

0 comments on commit 4d44a33

Please sign in to comment.