From 9a3e9df9860724f983e7375f53192df6167e663f Mon Sep 17 00:00:00 2001 From: John Freeman Date: Tue, 20 Feb 2024 13:57:23 -0600 Subject: [PATCH 1/6] Syncing .github/workflows/dunedaq-v4-cpp-ci.yml --- ...velop-cpp-ci.yml => dunedaq-v4-cpp-ci.yml} | 50 +++++++++---------- 1 file changed, 24 insertions(+), 26 deletions(-) rename .github/workflows/{dunedaq-develop-cpp-ci.yml => dunedaq-v4-cpp-ci.yml} (57%) diff --git a/.github/workflows/dunedaq-develop-cpp-ci.yml b/.github/workflows/dunedaq-v4-cpp-ci.yml similarity index 57% rename from .github/workflows/dunedaq-develop-cpp-ci.yml rename to .github/workflows/dunedaq-v4-cpp-ci.yml index cb376c0..88e0679 100644 --- a/.github/workflows/dunedaq-develop-cpp-ci.yml +++ b/.github/workflows/dunedaq-v4-cpp-ci.yml @@ -20,17 +20,15 @@ on: jobs: - Spack_Build_against_dev_release: - name: spack_build_against_dev_on_${{ matrix.os_name }} + Build_against_dev_release: + name: build_against_dev_on_${{ matrix.os_name }} # The type of runner that the job will run on runs-on: ubuntu-latest strategy: matrix: include: - - image: "ghcr.io/dune-daq/sl7-slim-externals:spack-dev" - os_name: "c7" - - image: "ghcr.io/dune-daq/c8-slim-externals:spack-dev" - os_name: "c8" + - image: "ghcr.io/dune-daq/nightly-release-alma9:production_v4" + os_name: "a9" container: image: ${{ matrix.image }} defaults: @@ -49,42 +47,42 @@ jobs: - name: setup dev area run: | + export REPO=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}') source /cvmfs/dunedaq.opensciencegrid.org/setup_dunedaq.sh - setup_dbt latest|| true - dbt-create -n last_successful dev-${{ matrix.os_name }} - + setup_dbt latest || true + release_name="last_fddaq" + + dbt-create -n $release_name dev-${{ matrix.os_name }} + - name: checkout package for CI uses: actions/checkout@v3 with: path: ${{ github.repository }} - name: setup build env, build the repo against the development release - #- name: setup build env, build and lint the repo against the development release run: | export REPO=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}') cd $GITHUB_WORKSPACE/dev-${{ matrix.os_name }} source env.sh || true - spack unload $REPO + + spack unload $REPO || true cp -pr $GITHUB_WORKSPACE/DUNE-DAQ/$REPO $GITHUB_WORKSPACE/dev-${{ matrix.os_name }}/sourcecode - dbt-build - #[[ $REPO == "daq-cmake" ]] && dbt-build || dbt-build --lint - dbt-workarea-env - #dbt-build --unittest + dbt-build # --unittest # --lint - name: upload build log file uses: actions/upload-artifact@v3 with: - name: spack_build_log_${{ matrix.os_name }} + name: build_log_${{ matrix.os_name }} path: ${{ github.workspace }}/dev-${{ matrix.os_name }}/log/build*.log - #- name: upload linter output file - #uses: actions/upload-artifact@v3 - #with: - #name: spack_linting_log_${{ matrix.os_name }} - #path: ${{ github.workspace }}/dev-${{ matrix.os_name }}/log/linting* + # - name: upload linter output file + # uses: actions/upload-artifact@v3 + # with: + # name: linting_log_${{ matrix.os_name }} + # path: ${{ github.workspace }}/dev-${{ matrix.os_name }}/log/linting* - #- name: upload unittest output file - #uses: actions/upload-artifact@v2 - #with: - #name: spack_unit_tests_log_${{ matrix.os_name }} - #path: ${{ github.workspace }}/dev-${{ matrix.os_name }}/log/unit_tests* + # - name: upload unittest output file + # uses: actions/upload-artifact@v3 + # with: + # name: unit_tests_log_${{ matrix.os_name }} + # path: ${{ github.workspace }}/dev-${{ matrix.os_name }}/log/unit_tests* From f5dd0a957701235af9fbc51b2fd6d7aacc7b9ff1 Mon Sep 17 00:00:00 2001 From: John Freeman Date: Sat, 13 Apr 2024 17:22:37 -0500 Subject: [PATCH 2/6] Syncing .github/workflows/dunedaq-v4-cpp-ci.yml --- .github/workflows/dunedaq-v4-cpp-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dunedaq-v4-cpp-ci.yml b/.github/workflows/dunedaq-v4-cpp-ci.yml index 88e0679..0e7f823 100644 --- a/.github/workflows/dunedaq-v4-cpp-ci.yml +++ b/.github/workflows/dunedaq-v4-cpp-ci.yml @@ -5,7 +5,7 @@ name: build-develop on: push: branches: - - develop + - production/v4 - patch/* - prep-release/* paths-ignore: From 6cffb57afdeab6506f57cfc3c1630b877d9418d6 Mon Sep 17 00:00:00 2001 From: Andrew Mogan Date: Thu, 25 Apr 2024 09:25:57 -0500 Subject: [PATCH 3/6] Syncing .github/workflows/dunedaq-v4-cpp-ci.yml --- .github/workflows/dunedaq-v4-cpp-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dunedaq-v4-cpp-ci.yml b/.github/workflows/dunedaq-v4-cpp-ci.yml index 0e7f823..7c9cc24 100644 --- a/.github/workflows/dunedaq-v4-cpp-ci.yml +++ b/.github/workflows/dunedaq-v4-cpp-ci.yml @@ -12,9 +12,9 @@ on: - 'docs/**' - '.github/**' pull_request: - branches: [ develop ] + branches: [ production/v4 ] schedule: - - cron: "0 7 * * *" + - cron: "0 9 * * *" workflow_dispatch: From 8d2f7dd63c69525dc5a64a72a320ff55de9c517b Mon Sep 17 00:00:00 2001 From: Andrew Mogan Date: Thu, 30 May 2024 11:47:24 -0500 Subject: [PATCH 4/6] Syncing .github/workflows/dunedaq-v4-cpp-ci.yml --- .github/workflows/dunedaq-v4-cpp-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dunedaq-v4-cpp-ci.yml b/.github/workflows/dunedaq-v4-cpp-ci.yml index 7c9cc24..cea93d9 100644 --- a/.github/workflows/dunedaq-v4-cpp-ci.yml +++ b/.github/workflows/dunedaq-v4-cpp-ci.yml @@ -49,7 +49,7 @@ jobs: run: | export REPO=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}') source /cvmfs/dunedaq.opensciencegrid.org/setup_dunedaq.sh - setup_dbt latest || true + setup_dbt latest_v4 || true release_name="last_fddaq" dbt-create -n $release_name dev-${{ matrix.os_name }} From 225be986fc66aaf738359d50399149fcc804fa6b Mon Sep 17 00:00:00 2001 From: Andrew Mogan Date: Wed, 6 Nov 2024 09:08:18 -0600 Subject: [PATCH 5/6] Syncing .github/workflows/dunedaq-v4-cpp-ci.yml --- .github/workflows/dunedaq-v4-cpp-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dunedaq-v4-cpp-ci.yml b/.github/workflows/dunedaq-v4-cpp-ci.yml index cea93d9..9adfa45 100644 --- a/.github/workflows/dunedaq-v4-cpp-ci.yml +++ b/.github/workflows/dunedaq-v4-cpp-ci.yml @@ -70,19 +70,19 @@ jobs: dbt-build # --unittest # --lint - name: upload build log file - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: build_log_${{ matrix.os_name }} path: ${{ github.workspace }}/dev-${{ matrix.os_name }}/log/build*.log # - name: upload linter output file - # uses: actions/upload-artifact@v3 + # uses: actions/upload-artifact@v4 # with: # name: linting_log_${{ matrix.os_name }} # path: ${{ github.workspace }}/dev-${{ matrix.os_name }}/log/linting* # - name: upload unittest output file - # uses: actions/upload-artifact@v3 + # uses: actions/upload-artifact@v4 # with: # name: unit_tests_log_${{ matrix.os_name }} # path: ${{ github.workspace }}/dev-${{ matrix.os_name }}/log/unit_tests* From 876d35ebc34aa27174359f4e08b8793cd14ec236 Mon Sep 17 00:00:00 2001 From: Andrew Mogan Date: Tue, 12 Nov 2024 14:16:50 -0600 Subject: [PATCH 6/6] Syncing .github/workflows/dunedaq-v4-cpp-ci.yml --- .github/workflows/dunedaq-v4-cpp-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dunedaq-v4-cpp-ci.yml b/.github/workflows/dunedaq-v4-cpp-ci.yml index 9adfa45..5cdac51 100644 --- a/.github/workflows/dunedaq-v4-cpp-ci.yml +++ b/.github/workflows/dunedaq-v4-cpp-ci.yml @@ -40,7 +40,7 @@ jobs: # Runs a single command using the runners shell - name: Checkout daq-release - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: DUNE-DAQ/daq-release path: daq-release @@ -55,7 +55,7 @@ jobs: dbt-create -n $release_name dev-${{ matrix.os_name }} - name: checkout package for CI - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: ${{ github.repository }}