Merge pull request #4356 from vicentebolea/backport-ci-changes (f20747e7) · Commits · ecpcitest / ADIOS2

.gitattributes

+1 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@
		*.F90 text
		*.sh text

		CMakeLists.txt whitespace=tab-in-indent
		*.cmake whitespace=tab-in-indent
		*.md whitespace=tab-in-indent whitespace=-blank-at-eol conflict-marker-size=79
		*.rst whitespace=tab-in-indent conflict-marker-size=79

.github/workflows/everything.yml

+53 −36

Original line number	Diff line number	Diff line
		@@ -65,7 +65,7 @@ jobs:
		ls -la *-changed-files.txt
		NUM_CHANGES=$(wc -l < filtered-changed-files.txt)
		echo "Number of files changed (filtered): ${NUM_CHANGES}"
		echo "::set-output name=num_code_changes::${NUM_CHANGES}"
		echo "num_code_changes=${NUM_CHANGES}" >> $GITHUB_OUTPUT

		#######################################
		# Formatting jobs
		@@ -108,13 +108,13 @@ jobs:
		# Build and test jobs
		#######################################

		linux_ubuntu:
		ubuntu:
		needs: [format, git_checks]
		if: needs.git_checks.outputs.num_code_changes > 0

		runs-on: ubuntu-20.04
		container:
		image: ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-${{ matrix.compiler }}
		image: ghcr.io/ornladios/adios2:ci-spack-${{ matrix.os }}-${{ matrix.compiler }}
		options: --shm-size=1g
		env:
		GH_YML_JOBNAME: ${{ matrix.os }}-${{ matrix.compiler }}${{ matrix.shared == 'static' && '-static' \|\| ''}}-${{ matrix.parallel }}
		@@ -131,8 +131,7 @@ jobs:
		fail-fast: false
		matrix:
		os: [ubuntu20.04]
		compiler: [gcc8, gcc9, gcc10, gcc11, clang6, clang10]
		shared: [shared]
		compiler: [gcc8, gcc9, gcc10, clang6, clang10]
		parallel: [mpich]
		include:
		- os: ubuntu20.04
		@@ -149,18 +148,25 @@ jobs:
		parallel: serial
		- os: ubuntu20.04
		compiler: gcc8
		parallel: serial
		shared: static
		parallel: ompi
		constrains: build_only
		- os: ubuntu20.04
		compiler: clang6
		compiler: gcc8
		shared: static
		parallel: ompi
		parallel: mpich
		constrains: build_only
		- os: ubuntu20.04
		compiler: gcc8
		compiler: clang6
		shared: static
		parallel: mpich
		constrains: build_only
		- os: ubuntu22.04
		compiler: rocm
		parallel: serial
		constrains: build_only
		- os: ubuntu22.04
		compiler: gcc11
		parallel: mpich
		steps:
		- uses: actions/checkout@v4
		with:
		@@ -170,7 +176,7 @@ jobs:
		ref: ${{ github.event.pull_request.head.sha }}
		path: source
		- name: Restore cache
		uses: actions/cache/restore@v3
		uses: actions/cache/restore@v4
		id: restore-cache
		with:
		path: .ccache
		@@ -190,7 +196,7 @@ jobs:
		- name: Print ccache statistics
		run: ccache -s \| tee $GITHUB_STEP_SUMMARY
		- name: Save cache
		uses: actions/cache/save@v3
		uses: actions/cache/save@v4
		if: ${{ github.ref_name == 'master' && steps.restore-cache.outputs.cache-hit != 'true' }}
		id: save-cache
		with:
		@@ -200,7 +206,7 @@ jobs:
		if: ${{ matrix.constrains != 'build_only' }}
		run: gha/scripts/ci/gh-actions/run.sh test

		linux_el8:
		el8:
		needs: [format, git_checks]
		if: needs.git_checks.outputs.num_code_changes > 0

		@@ -235,7 +241,7 @@ jobs:
		ref: ${{ github.event.pull_request.head.sha }}
		path: source
		- name: Restore cache
		uses: actions/cache/restore@v3
		uses: actions/cache/restore@v4
		id: restore-cache
		with:
		path: .ccache
		@@ -255,7 +261,7 @@ jobs:
		- name: Print ccache statistics
		run: ccache -s
		- name: Save cache
		uses: actions/cache/save@v3
		uses: actions/cache/save@v4
		if: ${{ github.ref_name == 'master' && steps.restore-cache.outputs.cache-hit != 'true' }}
		id: save-cache
		with:
		@@ -270,31 +276,38 @@ jobs:

		runs-on: ${{ matrix.image }}
		env:
		GH_YML_JOBNAME: ${{ matrix.image }}-${{ matrix.compiler }}-${{ matrix.shared }}-${{ matrix.parallel }}
		# Only way to source a file in a non interactive/non login shell.
		BASH_ENV: "/Users/runner/.bash_profile"
		CCACHE_BASEDIR: "${GITHUB_WORKSPACE}"
		CCACHE_COMPRESSLEVEL: 6
		CCACHE_COMPRESS: true
		CCACHE_DIR: "${GITHUB_WORKSPACE}/.ccache"
		GH_YML_BASE_OS: macOS
		GH_YML_MATRIX_OS: ${{ matrix.image }}
		GH_YML_JOBNAME: ${{ matrix.image }}-${{ matrix.compiler }}-${{ matrix.shared }}-${{ matrix.parallel }}
		GH_YML_MATRIX_ARCH : ${{ matrix.arch }}
		GH_YML_MATRIX_COMPILER: ${{ matrix.compiler }}
		GH_YML_MATRIX_OS: ${{ matrix.image }}
		GH_YML_MATRIX_PARALLEL: ${{ matrix.parallel }}
		CCACHE_BASEDIR: "${GITHUB_WORKSPACE}"
		CCACHE_DIR: "${GITHUB_WORKSPACE}/.ccache"
		CCACHE_COMPRESS: true
		CCACHE_COMPRESSLEVEL: 6

		strategy:
		fail-fast: false
		matrix:
		image: [macos-11, macos-12]
		shared: [static, shared]
		image: [macos-13, macos-14]
		shared: [shared, static]
		include:
		- image: macos-13
		arch: x64
		compiler: xcode14_2
		- image: macos-14
		arch: arm64
		compiler: xcode15_4
		- parallel: serial
		- image: macos-11
		compiler: xcode13_0
		- image: macos-12
		compiler: xcode13_4_1
		exclude:
		- image: macos-11
		- image: macos-13
		shared: static

		name: macos (${{ matrix.image }}, ${{ matrix.compiler}}, ${{ matrix.arch }}, ${{ matrix.shared }}, ${{ matrix.parallel }})

		steps:
		- uses: actions/checkout@v4
		with:
		@@ -306,7 +319,7 @@ jobs:
		- name: Setup
		run: gha/scripts/ci/gh-actions/macos-setup.sh
		- name: Restore cache
		uses: actions/cache/restore@v3
		uses: actions/cache/restore@v4
		id: restore-cache
		with:
		path: .ccache
		@@ -324,7 +337,7 @@ jobs:
		- name: Print ccache statistics
		run: ccache -s
		- name: Save cache
		uses: actions/cache/save@v3
		uses: actions/cache/save@v4
		if: ${{ github.ref_name == 'master' && steps.restore-cache.outputs.cache-hit != 'true' }}
		id: save-cache
		with:
		@@ -350,7 +363,7 @@ jobs:
		matrix:
		os: [win2019, win2022]
		shared: [shared]
		parallel: [serial, ompi]
		parallel: [msmpi]
		include:
		- os: win2019
		image: windows-2019
		@@ -358,6 +371,10 @@ jobs:
		- os: win2022
		image: windows-2022
		compiler: vs2022
		- os: win2022
		image: windows-2022
		compiler: vs2022
		parallel: serial
		- os: win2022
		image: windows-2022
		shared: static
		@@ -427,7 +444,7 @@ jobs:
		docker save -o ci-docker.tar ornladios/adios2:ci-tmp
		ls -lah ci-docker.tar
		- name: Upload
		uses: actions/upload-artifact@v2
		uses: actions/upload-artifact@v4
		with:
		retention-days: 1
		name: ci-docker ${{ matrix.baseos }} ${{ github.sha }}
		@@ -484,7 +501,7 @@ jobs:
		ref: ${{ matrix.ref }}
		path: source
		- name: Download CI docker image
		uses: actions/download-artifact@v2
		uses: actions/download-artifact@v4
		with:
		name: ci-docker ubuntu-bionic ${{ github.sha }}
		- name: Initialize containers
		@@ -544,7 +561,7 @@ jobs:
		ref: ${{ github.event.pull_request.head.sha }}
		path: source
		- name: Initialize CodeQL
		uses: github/codeql-action/init@v2
		uses: github/codeql-action/init@v3
		with:
		languages: ${{ matrix.language }}
		config: \|
		@@ -561,7 +578,7 @@ jobs:
		- name: Build
		run: gha/scripts/ci/gh-actions/run.sh build
		- name: Perform CodeQL Analysis
		uses: github/codeql-action/analyze@v2
		uses: github/codeql-action/analyze@v3
		with:
		category: "/language:${{matrix.language}}"

		@@ -570,7 +587,7 @@ jobs:
		#######################################

		build_and_test:
		needs: [linux_el8, linux_ubuntu, macos, docker, contract]
		needs: [el8, ubuntu, macos, docker, contract]
		runs-on: ubuntu-latest
		steps:
		- run: echo "All required jobs complete"

.github/workflows/pypackaging.yml

+20 −10

Original line number	Diff line number	Diff line
		@@ -5,6 +5,15 @@ on:
		inputs:
		overrideVersion:
		description: Manually force a version
		pypiServer:
		description: Server to publish the pip package
		required: true
		default: 'testpypi'
		type: choice
		options:
		- 'testpypi'
		- 'pypi'

		pull_request:
		push:
		branches:
		@@ -34,8 +43,9 @@ jobs:
		- name: Build SDist
		run: pipx run build --sdist

		- uses: actions/upload-artifact@v3
		- uses: actions/upload-artifact@v4
		with:
		name: artifact_sdist
		path: dist/*.tar.gz

		build_wheels:
		@@ -60,8 +70,9 @@ jobs:
		CIBW_BUILD: cp*-manylinux_x86_64

		- name: Upload wheels
		uses: actions/upload-artifact@v3
		uses: actions/upload-artifact@v4
		with:
		name: artifact_wheels
		path: wheelhouse/*.whl

		upload_pypi:
		@@ -71,16 +82,16 @@ jobs:
		id-token: write
		runs-on: ubuntu-latest
		if: \|
		github.event_name == 'workflow_dispatch' \|\|
		github.event_name == 'workflow_dispatch' && github.event.inputs.pypiServer == 'pypi' \|\|
		(
		github.event_name == 'release' &&
		github.event.action == 'published'
		)
		steps:
		- uses: actions/download-artifact@v3
		- uses: actions/download-artifact@v4
		with:
		name: artifact
		path: dist
		merge-multiple: true

		- name: Publish package distributions to PyPI
		uses: pypa/gh-action-pypi-publish@release/v1
		@@ -91,14 +102,13 @@ jobs:
		permissions:
		id-token: write
		runs-on: ubuntu-latest
		# Upload to Test PyPI for every commit on main branch
		if: github.event_name == 'push' && github.event.ref == 'refs/heads/master'
		if: github.event_name == 'workflow_dispatch' && github.event.inputs.pypiServer == 'testpypi'
		steps:
		- uses: actions/download-artifact@v3
		- uses: actions/download-artifact@v4
		with:
		name: artifact
		path: dist

		merge-multiple: true
		- run: ls -R dist
		- name: Publish package distributions to TestPyPI
		uses: pypa/gh-action-pypi-publish@release/v1
		with:

.github/workflows/sync.yml

0 → 100644

+30 −0

Original line number	Diff line number	Diff line
		name: OLCF sync script

		on:
		schedule:
		- cron: "0/10 * * * *"
		workflow_dispatch:

		jobs:
		sync-script:
		if: github.repository == 'ornladios/ADIOS2'
		name: Sync Script
		runs-on: ubuntu-20.04
		environment: sync-script
		steps:
		- uses: actions/checkout@v4
		with:
		fetch-depth: 0
		- uses: actions/setup-python@v5
		with:
		python-version: '3.6.15'
		- run: pip install python-dateutil PyGithub
		- run: >
		.gitlab/config/SpackCIBridge.py
		ornladios/ADIOS2 git@code.ornl.gov:ecpcitest/adios2.git
		https://code.ornl.gov/ ecpcitest/adios2
		--prereq-check=format --prereq-check=git_checks --disable-status-post
		env:
		GITLAB_SSH_KEY_BASE64: ${{ secrets.GITLAB_SSH_KEY_BASE64}}
		GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

+8 −0

Original line number	Diff line number	Diff line
		@@ -44,3 +44,11 @@ CMakeSettings.json
		# Python wheels stuff

		*.egg-info/

		# CMake generated files
		build/
		.idea/
		.vscode/

		# redis dump files
		*.rdb
		No newline at end of file

Admin message