Skip to content

Commit 02c2be2

Browse files
authored
Merge branch 'master' into feature/gui-layer-dispatchorder
Signed-off-by: Alexis Oblet <aoblet@users.noreply.github.com>
2 parents d3927a0 + eb5ed41 commit 02c2be2

485 files changed

Lines changed: 45255 additions & 7158 deletions

File tree

Some content is hidden

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

.dockerignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@ ci
33
cuebot/src/compiled_protobuf
44
images
55
samples
6-
sandbox/db-data
76
tsc
87
venv

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ It's also helpful to describe **why** you're making this change.
1111

1212
<!--
1313
For a step-by-step list to walk you through the pull request process, see
14-
https://www.opencue.io/contributing/.
14+
https://docs.opencue.io/docs/developer-guide/contributing/.
1515
1616
Please add unit tests for any new code. This helps our project maintain code quality and ensure
1717
future changes don't break anything. If you're stuck on this or not sure how to proceed, feel

.github/workflows/docs-pipeline.yml

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ on:
77
- main
88
paths:
99
- 'docs/**'
10-
- '.github/workflows/docs.yml'
10+
- '.github/workflows/docs-pipeline.yml'
1111
tags:
1212
- 'v*' # Build docs for version tags
1313
pull_request:
1414
paths:
1515
- 'docs/**'
16-
- '.github/workflows/docs.yml'
16+
- '.github/workflows/docs-pipeline.yml'
1717
workflow_dispatch:
1818
inputs:
1919
version:
@@ -55,12 +55,8 @@ jobs:
5555
VERSION_TAG=${GITHUB_REF#refs/tags/}
5656
git checkout tags/$VERSION_TAG -b docs-$VERSION_TAG
5757
58-
- name: Setup Ruby
59-
uses: ruby/setup-ruby@v1
60-
with:
61-
ruby-version: '3.2'
62-
bundler-cache: true
63-
working-directory: ./docs
58+
- name: Set up Docker Buildx
59+
uses: docker/setup-buildx-action@v3
6460

6561
- name: Extract version information
6662
id: version
@@ -107,7 +103,12 @@ jobs:
107103
git_hash: "$(git rev-parse --short HEAD)"
108104
EOF
109105
110-
- name: Build with Jekyll
106+
- name: Build Docker image
107+
working-directory: ./docs
108+
run: |
109+
docker build -t opencue-docs:ci .
110+
111+
- name: Build with Jekyll using Docker
111112
working-directory: ./docs
112113
run: |
113114
# Set version in config
@@ -122,24 +123,31 @@ jobs:
122123
echo "opencue_version: ${{ steps.version.outputs.opencue_version }}" >> _config.yml
123124
124125
# Determine baseurl based on deployment target
125-
# For docs.opencue.io deployment, use empty baseurl
126-
# For GitHub Pages in forks, use /OpenCue
126+
BASEURL=""
127127
if [ "${{ github.repository }}" = "AcademySoftwareFoundation/OpenCue" ]; then
128128
# Main repository - deploying to docs.opencue.io
129-
bundle exec jekyll build --baseurl ""
129+
BASEURL=""
130130
elif [ "${{ github.event_name }}" = "pull_request" ]; then
131131
# Pull request - use GitHub Pages path
132-
bundle exec jekyll build --baseurl "/OpenCue"
132+
BASEURL="/OpenCue"
133133
else
134134
# Fork or other deployment - use GitHub Pages path
135135
if [ "${{ steps.version.outputs.version }}" != "main" ]; then
136-
bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path }}/${{ steps.version.outputs.version }}"
136+
BASEURL="${{ steps.pages.outputs.base_path }}/${{ steps.version.outputs.version }}"
137137
else
138-
bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path }}"
138+
BASEURL="${{ steps.pages.outputs.base_path }}"
139139
fi
140140
fi
141-
env:
142-
JEKYLL_ENV: production
141+
142+
# Build documentation using Docker
143+
docker run --rm \
144+
-v "$(pwd):/docs" \
145+
-e JEKYLL_ENV=production \
146+
opencue-docs:ci \
147+
bundle exec jekyll build --baseurl "$BASEURL" --verbose
148+
149+
# Fix permissions after Docker build (Docker runs as root, so files are owned by root)
150+
sudo chown -R $USER:$USER _site/
143151
144152
- name: Create version redirect
145153
if: github.event_name != 'pull_request'

.github/workflows/packaging-pipeline.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ jobs:
5656
- target: x86_64-unknown-linux-musl
5757
os: ubuntu-22.04
5858
- target: x86_64-apple-darwin
59-
os: macos-13
59+
os: macos-14
6060
- target: aarch64-apple-darwin
61-
os: macos-13
61+
os: macos-14
6262
runs-on: ${{ matrix.os }}
6363
outputs:
6464
rust_binaries_artifact: rust-binaries-${{ github.sha }}
@@ -86,7 +86,7 @@ jobs:
8686
fi
8787
8888
- name: Install dependencies (macOS)
89-
if: matrix.os == 'macos-13'
89+
if: matrix.os == 'macos-14'
9090
run: |
9191
brew install protobuf
9292
@@ -97,7 +97,7 @@ jobs:
9797
- name: Build Rust binaries
9898
run: |
9999
cd rust
100-
cargo build --release --target ${{ matrix.target }} --no-default-features
100+
cargo build --release --target ${{ matrix.target }} --no-default-features -p rqd
101101
102102
- name: Create release directory
103103
run: mkdir -p release
@@ -108,7 +108,7 @@ jobs:
108108
cp rust/target/${{ matrix.target }}/release/openrqd release/openrqd-${{ env.BUILD_ID }}-${{ matrix.target }}
109109
110110
- name: Copy binaries (macOS)
111-
if: matrix.os == 'macos-13'
111+
if: matrix.os == 'macos-14'
112112
run: |
113113
cp rust/target/${{ matrix.target }}/release/openrqd release/openrqd-${{ env.BUILD_ID }}-${{ matrix.target }}
114114

.github/workflows/release-pipeline.yml

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,20 @@ on:
77
- "v*"
88

99
jobs:
10+
check_opencue_licenses:
11+
name: Check Licenses of OpenCue Dependencies
12+
runs-on: ubuntu-22.04
13+
container: python:3.9
14+
steps:
15+
- uses: actions/checkout@v4
16+
with:
17+
fetch-depth: 0
18+
fetch-tags: true
19+
20+
- name: Run license check
21+
shell: bash
22+
run: ci/check_licenses.sh
23+
1024
build_opencue_packages:
1125
name: Build Python Packages
1226
runs-on: ubuntu-22.04
@@ -67,9 +81,9 @@ jobs:
6781
- target: x86_64-unknown-linux-musl
6882
os: ubuntu-22.04
6983
- target: x86_64-apple-darwin
70-
os: macos-13
84+
os: macos-14
7185
- target: aarch64-apple-darwin
72-
os: macos-13
86+
os: macos-14
7387
runs-on: ${{ matrix.os }}
7488
steps:
7589
- uses: actions/checkout@v4
@@ -107,7 +121,7 @@ jobs:
107121
fi
108122
109123
- name: Install dependencies (macOS)
110-
if: matrix.os == 'macos-13'
124+
if: matrix.os == 'macos-14'
111125
run: |
112126
brew install protobuf
113127
@@ -118,7 +132,7 @@ jobs:
118132
- name: Build Rust binaries
119133
run: |
120134
cd rust
121-
cargo build --release --target ${{ matrix.target }} --no-default-features
135+
cargo build --release --target ${{ matrix.target }} --no-default-features -p rqd
122136
123137
- name: Create release directory
124138
run: mkdir -p release
@@ -129,7 +143,7 @@ jobs:
129143
cp rust/target/${{ matrix.target }}/release/openrqd release/openrqd-${{ env.BUILD_ID }}-${{ matrix.target }}
130144
131145
- name: Copy binaries (macOS)
132-
if: matrix.os == 'macos-13'
146+
if: matrix.os == 'macos-14'
133147
run: |
134148
cp rust/target/${{ matrix.target }}/release/openrqd release/openrqd-${{ env.BUILD_ID }}-${{ matrix.target }}
135149

.github/workflows/rust-pipeline.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- uses: actions/checkout@v4
1818
- name: Install X11 dev libs
1919
run: |
20-
sudo apt-get update && sudo apt-get install -y libx11-dev protobuf-compiler
20+
sudo apt-get update && sudo apt-get install -y libx11-dev protobuf-compiler libcurl4-openssl-dev
2121
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > rust-install.sh
2222
bash ./rust-install.sh -y
2323
- name: Build
@@ -36,7 +36,7 @@ jobs:
3636
- uses: actions/checkout@v4
3737
- name: Install X11 dev libs
3838
run: |
39-
sudo apt-get update && sudo apt-get install -y libx11-dev protobuf-compiler
39+
sudo apt-get update && sudo apt-get install -y libx11-dev protobuf-compiler libcurl4-openssl-dev
4040
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > rust-install.sh
4141
bash ./rust-install.sh -y
4242
- name: Run Clippy

.github/workflows/testing-pipeline.yml

Lines changed: 59 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,20 @@ on:
77
branches: [master]
88

99
jobs:
10+
check_opencue_licenses:
11+
name: Check Licenses of OpenCue Dependencies
12+
runs-on: ubuntu-22.04
13+
container: python:3.9
14+
steps:
15+
- uses: actions/checkout@v4
16+
with:
17+
fetch-depth: 0
18+
fetch-tags: true
19+
20+
- name: Run license check
21+
shell: bash
22+
run: ci/check_licenses.sh
23+
1024
build_opencue_packages:
1125
name: Build Python Packages
1226
runs-on: ubuntu-22.04
@@ -130,7 +144,7 @@ jobs:
130144
- name: Build with Gradle
131145
run: |
132146
chown -R aswfuser:aswfgroup .
133-
su -c "cd cuebot && ./gradlew build --stacktrace --info" aswfuser
147+
su -c "cd cuebot && ./gradlew build --stacktrace" aswfuser
134148
135149
test_python_2024:
136150
needs: build_opencue_packages
@@ -177,7 +191,7 @@ jobs:
177191
- name: Build with Gradle
178192
run: |
179193
chown -R aswfuser:aswfgroup .
180-
su -c "cd cuebot && ./gradlew build --stacktrace --info" aswfuser
194+
su -c "cd cuebot && ./gradlew build --stacktrace" aswfuser
181195
182196
integration_test:
183197
needs: build_opencue_packages
@@ -377,3 +391,46 @@ jobs:
377391
with:
378392
name: rest-gateway-coverage
379393
path: rest_gateway/opencue_gateway/coverage.out
394+
395+
build_cueweb:
396+
name: Build CueWeb Docker Image
397+
runs-on: ubuntu-22.04
398+
steps:
399+
- name: Checkout
400+
uses: actions/checkout@v4
401+
with:
402+
fetch-depth: 0
403+
fetch-tags: true
404+
405+
- name: Mark repository as safe
406+
run: git config --global --add safe.directory $GITHUB_WORKSPACE
407+
408+
- name: Set up Docker Buildx
409+
uses: docker/setup-buildx-action@v3
410+
411+
- name: Build CueWeb Docker image
412+
working-directory: cueweb
413+
run: |
414+
docker buildx build . -f Dockerfile -t opencue/cueweb:test --load
415+
echo "CueWeb Docker image built successfully"
416+
417+
build_rest_gateway:
418+
name: Build REST Gateway Docker Image
419+
runs-on: ubuntu-22.04
420+
steps:
421+
- name: Checkout
422+
uses: actions/checkout@v4
423+
with:
424+
fetch-depth: 0
425+
fetch-tags: true
426+
427+
- name: Mark repository as safe
428+
run: git config --global --add safe.directory $GITHUB_WORKSPACE
429+
430+
- name: Set up Docker Buildx
431+
uses: docker/setup-buildx-action@v3
432+
433+
- name: Build REST Gateway Docker image
434+
run: |
435+
docker buildx build . -f rest_gateway/Dockerfile -t opencue/rest-gateway:test --load
436+
echo "REST Gateway Docker image built successfully"

.gitignore

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,25 @@ cuebot/.project
2727
/pycue/opencue/compiled_proto/
2828
/rqd/rqd/compiled_proto/
2929
docker-compose-local.yml
30+
/sandbox/kafka*
31+
/sandbox/zookeeper*
3032
docs/_site/
3133
docs/bin/
3234
sandbox/kafka-data
3335
sandbox/zookeeper-data
3436
sandbox/zookeeper-logs
3537
docs/_data/version.yml
38+
target/*
39+
40+
# Agent files
41+
AGENTS.md
42+
CLAUDE.md
43+
44+
# Documentation navigation temporary file
45+
docs/nav_order_index.txt
46+
rust/.cargo/config.toml
47+
sandbox/pgadmin-data/*
48+
.claude/settings.json
49+
plans/*
50+
.entire/.gitignore
51+
.entire/settings.json

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Contributing to OpenCue
22

33
So, you want to contribute to OpenCue? To find out how you can help, refer to OpenCue's
4-
[contribution guidelines](https://www.opencue.io/contributing/opencue/contributing/).
4+
[contribution guidelines](https://docs.opencue.io/docs/developer-guide/contributing/).
55

66
## Guideline for new issues
77
GitHub issues are a great place to start a conversation! Issues aren’t restricted to bugs; we happily welcome feature requests and other suggestions submitted as issues.

0 commit comments

Comments
 (0)