Skip to content

Commit 378dde3

Browse files
DiegoTavaresDiegoTavares
committed
Merge branch 'master' into distributed_scheduler
Signed-off-by: Diego Tavares <[email protected]>
2 parents 71aa58b + f45146c commit 378dde3

File tree

246 files changed

+19675
-778
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

246 files changed

+19675
-778
lines changed

‎.github/actions/build-python-packages/action.yml‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
name: 'Build Python Packages'
2+
runs:
3+
using: composite
4+
steps:
5+
- name: Prepare building packages
6+
shell: bash
7+
run: |
8+
set -e
9+
pip install build==1.1.1
10+
11+
- name: Build opencue_proto package
12+
shell: bash
13+
run: |
14+
set -e
15+
python -m build --outdir packages -s ./proto
16+
python -m build --outdir packages -w ./proto
17+
18+
- name: Build opencue_pycue package
19+
shell: bash
20+
run: |
21+
set -e
22+
python -m build --outdir packages -s ./pycue
23+
python -m build --outdir packages -w ./pycue
24+
25+
- name: Build opencue_pyoutline package
26+
shell: bash
27+
run: |
28+
set -e
29+
python -m build --outdir packages -s ./pyoutline
30+
python -m build --outdir packages -w ./pyoutline
31+
32+
- name: Build opencue_cueadmin package
33+
shell: bash
34+
run: |
35+
set -e
36+
python -m build --outdir packages -s ./cueadmin
37+
python -m build --outdir packages -w ./cueadmin
38+
39+
- name: Build opencue_cueman package
40+
shell: bash
41+
run: |
42+
set -e
43+
python -m build --outdir packages -s ./cueman
44+
python -m build --outdir packages -w ./cueman
45+
46+
- name: Build opencue_cuesubmit package
47+
shell: bash
48+
run: |
49+
set -e
50+
python -m build --outdir packages -s ./cuesubmit
51+
python -m build --outdir packages -w ./cuesubmit
52+
53+
- name: Build opencue_cuegui package
54+
shell: bash
55+
run: |
56+
set -e
57+
python -m build --outdir packages -s ./cuegui
58+
python -m build --outdir packages -w ./cuegui
59+
60+
- name: Build opencue_rqd package
61+
shell: bash
62+
run: |
63+
set -e
64+
python -m build --outdir packages -s ./rqd
65+
python -m build --outdir packages -w ./rqd
66+
67+
- name: Fix permissions
68+
shell: bash
69+
run: chmod uog+rwX packages/*.*
70+
71+
- name: Upload opencue packages
72+
uses: actions/upload-artifact@v4
73+
with:
74+
name: opencue_packages
75+
path: packages

‎.github/workflows/docs.yml‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
name: Deploy Documentation
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
- main
8+
paths:
9+
- 'docs/**'
10+
- '.github/workflows/docs.yml'
11+
pull_request:
12+
paths:
13+
- 'docs/**'
14+
- '.github/workflows/docs.yml'
15+
workflow_dispatch:
16+
17+
permissions:
18+
contents: read
19+
pages: write
20+
id-token: write
21+
22+
concurrency:
23+
group: "pages"
24+
cancel-in-progress: false
25+
26+
jobs:
27+
# Build job
28+
build:
29+
runs-on: ubuntu-22.04
30+
steps:
31+
- name: Checkout
32+
uses: actions/checkout@v4
33+
with:
34+
fetch-depth: 0 # Fetch all history for versioning
35+
36+
- name: Setup Ruby
37+
uses: ruby/setup-ruby@v1
38+
with:
39+
ruby-version: '3.2'
40+
bundler-cache: true
41+
working-directory: ./docs
42+
43+
- name: Setup Pages
44+
id: pages
45+
uses: actions/configure-pages@v4
46+
if: github.event_name != 'pull_request'
47+
48+
- name: Build with Jekyll
49+
working-directory: ./docs
50+
run: |
51+
if [ "${{ github.event_name }}" = "pull_request" ]; then
52+
bundle exec jekyll build --baseurl "/OpenCue"
53+
else
54+
bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path }}"
55+
fi
56+
env:
57+
JEKYLL_ENV: production
58+
59+
- name: Upload artifact
60+
uses: actions/upload-pages-artifact@v3
61+
if: github.event_name != 'pull_request'
62+
with:
63+
path: ./docs/_site
64+
65+
# Deployment job
66+
deploy:
67+
environment:
68+
name: github-pages
69+
url: ${{ steps.deployment.outputs.page_url }}
70+
runs-on: ubuntu-22.04
71+
needs: build
72+
if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main'
73+
steps:
74+
- name: Deploy to GitHub Pages
75+
id: deployment
76+
uses: actions/deploy-pages@v4

‎.github/workflows/packaging-pipeline.yml‎

Lines changed: 69 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,71 @@ on:
66
branches: [ master ]
77

88
jobs:
9+
build_opencue_packages:
10+
name: Build Python Packages
11+
runs-on: ubuntu-22.04
12+
container: python:3.7
13+
outputs:
14+
opencue_proto_path: ${{ steps.package_outputs.outputs.opencue_proto_path }}
15+
opencue_pycue_path: ${{ steps.package_outputs.outputs.opencue_pycue_path }}
16+
opencue_pyoutline_path: ${{ steps.package_outputs.outputs.opencue_pyoutline_path }}
17+
opencue_cueadmin_path: ${{ steps.package_outputs.outputs.opencue_cueadmin_path }}
18+
opencue_cueman_path: ${{ steps.package_outputs.outputs.opencue_cueman_path }}
19+
opencue_cuesubmit_path: ${{ steps.package_outputs.outputs.opencue_cuesubmit_path }}
20+
opencue_rqd_path: ${{ steps.package_outputs.outputs.opencue_rqd_path }}
21+
steps:
22+
- uses: actions/checkout@v4
23+
with:
24+
fetch-tags: true
25+
fetch-depth: 0
26+
27+
- name: Mark repository as safe (Fix for https://github.com/actions/checkout/issues/1048)
28+
run: git config --global --add safe.directory $GITHUB_WORKSPACE
29+
30+
- uses: ./.github/actions/build-python-packages
31+
32+
- name: Gather package paths
33+
id: package_outputs
34+
run: |
35+
echo "opencue_proto_path=$(find ./packages -name 'opencue_proto-*.whl' -print -quit)" >> $GITHUB_OUTPUT
36+
echo "opencue_rqd_path=$(find ./packages -name 'opencue_rqd-*.whl' -print -quit)" >> $GITHUB_OUTPUT
37+
echo "opencue_pycue_path=$(find ./packages -name 'opencue_pycue-*.whl' -print -quit)" >> $GITHUB_OUTPUT
38+
echo "opencue_pyoutline_path=$(find ./packages -name 'opencue_pyoutline-*.whl' -print -quit)" >> $GITHUB_OUTPUT
39+
echo "opencue_cuesubmit_path=$(find ./packages -name 'opencue_cuesubmit-*.whl' -print -quit)" >> $GITHUB_OUTPUT
40+
echo "opencue_cueadmin_path=$(find ./packages -name 'opencue_cueadmin-*.whl' -print -quit)" >> $GITHUB_OUTPUT
41+
echo "opencue_cueman_path=$(find ./packages -name 'opencue_cueman-*.whl' -print -quit)" >> $GITHUB_OUTPUT
42+
echo "opencue_cuegui_path=$(find ./packages -name 'opencue_cuegui-*.whl' -print -quit)" >> $GITHUB_OUTPUT
43+
944
integration_test:
45+
needs: build_opencue_packages
1046
name: Run Integration Test
1147
runs-on: ubuntu-22.04
1248
steps:
1349
- name: Checkout
14-
uses: actions/checkout@v3
50+
uses: actions/checkout@v4
51+
with:
52+
fetch-depth: 0
53+
fetch-tags: true
54+
55+
- name: Mark repository as safe (Fix for https://github.com/actions/checkout/issues/1048)
56+
run: git config --global --add safe.directory $GITHUB_WORKSPACE
57+
58+
- name: Download a single artifact
59+
uses: actions/download-artifact@v4
60+
with:
61+
name: opencue_packages
62+
path: packages
1563

1664
- name: Run test
17-
run: ci/run_integration_test.sh
65+
run: |
66+
export OPENCUE_PROTO_PACKAGE_PATH="${{ needs.build_opencue_packages.outputs.opencue_proto_path }}"
67+
export OPENCUE_PYCUE_PACKAGE_PATH="${{ needs.build_opencue_packages.outputs.opencue_pycue_path }}"
68+
export OPENCUE_PYOUTLINE_PACKAGE_PATH="${{ needs.build_opencue_packages.outputs.opencue_pyoutline_path }}"
69+
export OPENCUE_CUEADMIN_PACKAGE_PATH="${{ needs.build_opencue_packages.outputs.opencue_cueadmin_path }}"
70+
export OPENCUE_CUEMAN_PACKAGE_PATH="${{ needs.build_opencue_packages.outputs.opencue_cueadmin_path }}"
71+
export OPENCUE_CUESUBMIT_PACKAGE_PATH="${{ needs.build_opencue_packages.outputs.opencue_cuesubmit_path }}"
72+
export OPENCUE_RQD_PACKAGE_PATH="${{ needs.build_opencue_packages.outputs.opencue_rqd_path }}"
73+
ci/run_integration_test.sh
1874
1975
- name: Archive log files
2076
uses: actions/upload-artifact@v4
@@ -57,8 +113,13 @@ jobs:
57113
NAME: CueAdmin
58114
ARTIFACTS: cueadmin-${BUILD_ID}-all.tar.gz
59115

116+
- component: cueman
117+
NAME: CueMan
118+
ARTIFACTS: cueman-${BUILD_ID}-all.tar.gz
119+
60120
name: Build ${{ matrix.NAME }}
61121
runs-on: ubuntu-22.04
122+
continue-on-error: true
62123
steps:
63124
- name: Checkout
64125
uses: actions/checkout@v3
@@ -85,9 +146,8 @@ jobs:
85146
- name: Set build ID
86147
run: |
87148
set -e
88-
ci/generate_version_number.sh > VERSION
89-
echo "Build ID: $(cat ./VERSION)"
90-
echo "BUILD_ID=$(cat ./VERSION)" >> ${GITHUB_ENV}
149+
echo "Build ID: $(ci/generate_version_number.py)"
150+
echo "BUILD_ID=$(ci/generate_version_number.py)" >> ${GITHUB_ENV}
91151
92152
- name: Build Docker image
93153
uses: docker/build-push-action@v3
@@ -122,6 +182,7 @@ jobs:
122182
name: Create Other Build Artifacts
123183
needs: build_components
124184
runs-on: ubuntu-22.04
185+
continue-on-error: true
125186
steps:
126187
- name: Checkout
127188
uses: actions/checkout@v3
@@ -141,10 +202,9 @@ jobs:
141202

142203
- name: Set build ID
143204
run: |
144-
set -e
145-
ci/generate_version_number.sh > VERSION
146-
echo "Build ID: $(cat ./VERSION)"
147-
echo "BUILD_ID=$(cat ./VERSION)" >> ${GITHUB_ENV}
205+
set -e
206+
echo "Build ID: $(ci/generate_version_number.py)"
207+
echo "BUILD_ID=$(ci/generate_version_number.py)" >> ${GITHUB_ENV}
148208
149209
- name: Extract database schema
150210
run: |

0 commit comments

Comments
 (0)