Skip to content

Commit 4f5b040

Browse files
eflumerfeflumerf
committed
Fix merge issues
1 parent 6f92e34 commit 4f5b040

File tree

4 files changed

+1
-220
lines changed

4 files changed

+1
-220
lines changed

‎.github/workflows/artdaq-develop-cpp-ci.yml‎

Lines changed: 0 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -20,75 +20,5 @@ on:
2020

2121
jobs:
2222
build_against_dev_release:
23-
<<<<<<< Updated upstream
24-
name: build_against_dev
25-
# The type of runner that the job will run on
26-
runs-on: ubuntu-latest
27-
28-
# Steps represent a sequence of tasks that will be executed as part of the job
29-
steps:
30-
- uses: cvmfs-contrib/github-action-cvmfs@main
31-
32-
- name: change dir permission
33-
run: |
34-
sudo chmod -R go+rwx /var/lib/cvmfs
35-
36-
- name: Cache cvmfs cache
37-
id: cvmfs_cache
38-
uses: actions/cache@main
39-
with:
40-
path: /var/lib/cvmfs/shared
41-
key: cachecvmfs
42-
43-
- name: restore dir permission
44-
run: |
45-
sudo chown -R cvmfs.cvmfs /var/lib/cvmfs
46-
sudo chmod -R go-rwx /var/lib/cvmfs
47-
48-
- name: Checkout pkg
49-
uses: actions/checkout@main
50-
with:
51-
repository: ${{ github.repository }}
52-
path: scratch/${{ github.repository }}
53-
54-
- name: run build in docker container with cvmfs bind mount
55-
run: |
56-
57-
cd $GITHUB_WORKSPACE/scratch
58-
cat << EOT > build_pkg.sh
59-
#!/bin/bash
60-
61-
cd /opt/otsdaq
62-
source /opt/otsdaq/products/setup
63-
source /opt/otsdaq/setup_ots.sh || exit 1
64-
mrb updateSource
65-
66-
export REPO=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')
67-
cp -pr /scratch/art-daq/$REPO srcs
68-
69-
echo "Starting build"
70-
mrb b 2>&1 | tee /scratch/art-daq/build.log
71-
72-
exit $?
73-
EOT
74-
chmod +x build_pkg.sh
75-
76-
docker run --rm -v /cvmfs:/cvmfs:shared -v $GITHUB_WORKSPACE/scratch:/scratch eflumerf/artdaq-suite:latest /scratch/build_pkg.sh
77-
78-
- name: Check build log for success
79-
run: |
80-
grep "INFO: stage build SUCCESS" ${{ github.workspace }}/scratch/art-daq/build.log
81-
82-
- name: upload build log file
83-
uses: actions/upload-artifact@main
84-
with:
85-
name: build_log
86-
path: ${{ github.workspace }}/scratch/art-daq/build.log
87-
88-
- name: change dir permission again
89-
run: |
90-
sudo chmod -R go+rwx /var/lib/cvmfs
91-
=======
9223
name: Build against develop
9324
uses: art-daq/.github/.github/workflows/artdaq-develop-cpp-ci.yml@stable
94-
>>>>>>> Stashed changes

‎.github/workflows/build-single-pkg.yml‎

Lines changed: 0 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -15,83 +15,4 @@ jobs:
1515

1616
build_single_pkg:
1717
name: build single pkg
18-
<<<<<<< Updated upstream
19-
runs-on: ubuntu-latest
20-
strategy:
21-
matrix:
22-
build-type: [ 'p' ]
23-
qualifiers: [ 's120b-e20', 's128-e28' ]
24-
25-
steps:
26-
- uses: cvmfs-contrib/github-action-cvmfs@main
27-
28-
- name: change dir permission
29-
run: |
30-
sudo chmod -R go+rwx /var/lib/cvmfs
31-
32-
- name: Cache cvmfs cache
33-
id: cvmfs_cache
34-
uses: actions/cache@main
35-
with:
36-
path: /var/lib/cvmfs/shared
37-
key: cachecvmfs
38-
39-
- name: restore dir permission
40-
run: |
41-
sudo chown -R cvmfs.cvmfs /var/lib/cvmfs
42-
sudo chmod -R go-rwx /var/lib/cvmfs
43-
44-
- name: Checkout pkg
45-
uses: actions/checkout@main
46-
with:
47-
repository: ${{ github.repository }}
48-
path: scratch/${{ github.repository }}
49-
50-
- name: run build in docker container with cvmfs bind mount
51-
run: |
52-
53-
cd $GITHUB_WORKSPACE/scratch
54-
cat << EOT > build_pkg.sh
55-
#!/bin/bash
56-
57-
cd /scratch/art-daq
58-
source /cvmfs/fermilab.opensciencegrid.org/products/artdaq/setup
59-
60-
export REPO=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')
61-
export quals=`echo ${{ matrix.qualifiers }}|sed 's/-/:/g'`
62-
export buildname="build_\${REPO}_${{ matrix.build-type }}_${{ matrix.qualifiers }}"
63-
64-
mkdir \$buildname
65-
cd \$buildname
66-
67-
echo "Logging to /scratch/\$buildname.log"
68-
echo "Calling source ../\$REPO/ups/setup_for_development -${{ matrix.build-type }} \$quals || true"
69-
source ../\$REPO/ups/setup_for_development -${{ matrix.build-type }} \$quals || exit 1
70-
71-
echo "Active UPS products:"
72-
ups active || true
73-
74-
echo "Calling buildtool 2>&1 | tee /scratch/\$buildname.log"
75-
CETPKG_J=4 buildtool 2>&1 | tee /scratch/\$buildname.log
76-
exit $?
77-
EOT
78-
chmod +x build_pkg.sh
79-
80-
docker run --rm -v /cvmfs:/cvmfs:shared -v $GITHUB_WORKSPACE/scratch:/scratch eflumerf/sl7-minimal:latest /scratch/build_pkg.sh
81-
82-
- name: Check build log for success
83-
run: |
84-
grep "INFO: stage build SUCCESS" ${{ github.workspace }}/scratch/build_*_${{ matrix.build-type }}_${{ matrix.qualifiers }}.log
85-
86-
- name: upload build log file
87-
uses: actions/upload-artifact@main
88-
with:
89-
name: build_log_${{ matrix.build-type }}_${{ matrix.qualifiers }}
90-
path: ${{ github.workspace }}/scratch/build_*_${{ matrix.build-type }}_${{ matrix.qualifiers }}.log
91-
92-
- name: change dir permission again
93-
run: |
94-
sudo chmod -R go+rwx /var/lib/cvmfs
95-
=======
9618
uses: art-daq/.github/.github/workflows/artdaq-build-single-pkg.yml@stable
97-
>>>>>>> Stashed changes

‎.github/workflows/test-single-pkg.yml‎

Lines changed: 0 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -10,79 +10,9 @@ on:
1010
pull_request:
1111
branches: [ develop ]
1212
workflow_dispatch:
13-
<<<<<<< Updated upstream
14-
inputs:
15-
build-type:
16-
description: 'build type, d or p'
17-
default: 'd'
18-
quals:
19-
description: 'qualifiers'
20-
default: 's128:e20'
21-
=======
22-
>>>>>>> Stashed changes
2313

2414
jobs:
2515

2616
build_single_pkg:
27-
<<<<<<< Updated upstream
28-
name: build single pkg
29-
runs-on: ubuntu-latest
30-
31-
steps:
32-
- uses: cvmfs-contrib/github-action-cvmfs@main
33-
34-
- name: change dir permission
35-
run: |
36-
sudo chmod -R go+rwx /var/lib/cvmfs
37-
38-
- name: Cache cvmfs cache
39-
id: cvmfs_cache
40-
uses: actions/cache@main
41-
with:
42-
path: /var/lib/cvmfs/shared
43-
key: cachecvmfs
44-
45-
- name: restore dir permission
46-
run: |
47-
sudo chown -R cvmfs.cvmfs /var/lib/cvmfs
48-
sudo chmod -R go-rwx /var/lib/cvmfs
49-
50-
- name: Checkout pkg
51-
uses: actions/checkout@main
52-
with:
53-
repository: ${{ github.repository }}
54-
path: scratch/${{ github.repository }}
55-
56-
- name: start docker container with bind mount cvmfs
57-
run: |
58-
59-
export REPO=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')
60-
cd $GITHUB_WORKSPACE/scratch
61-
cat << EOT > build_pkg.sh
62-
#!/bin/bash
63-
64-
cd /scratch/art-daq
65-
source /cvmfs/fermilab.opensciencegrid.org/products/artdaq/setup || true
66-
67-
mkdir build_$REPO
68-
cd build_$REPO
69-
source ../$REPO/ups/setup_for_development -${{ github.matrix.build-type }} ${{ github.matrix.qualifiers }} || true
70-
buildtool -t 2>&1 | tee build.log
71-
EOT
72-
chmod +x build_pkg.sh
73-
74-
docker run --rm -v /cvmfs:/cvmfs:shared -v $GITHUB_WORKSPACE/scratch:/scratch eflumerf/sl7-minimal:latest /scratch/build_pkg.sh
75-
76-
- name: upload build log file
77-
uses: actions/upload-artifact@main
78-
with:
79-
name: build_log_${{ matrix.os_name }}
80-
path: ${{ github.workspace }}/scratch/build_*/build.log
81-
82-
- name: change dir permission again
83-
run: |
84-
sudo chmod -R go+rwx /var/lib/cvmfs
85-
=======
8617
name: test single pkg
8718
uses: art-daq/.github/.github/workflows/artdaq-test-single-pkg.yml@stable
88-
>>>>>>> Stashed changes

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ cmake_minimum_required (VERSION 3.19)
1010

1111
find_package(cetmodules 3.08.00 REQUIRED)
1212

13-
project(artdaq_core_demo VERSION 1.11.00)
13+
project(artdaq_core_demo VERSION 1.11.01)
1414

1515
include(CetCMakeEnv)
1616
cet_cmake_env()

0 commit comments

Comments
 (0)