From 9cf7b55b316cad7f6cae801e74006b7fa2ba75db Mon Sep 17 00:00:00 2001 From: doctorperceptron Date: Thu, 10 Jul 2025 15:09:14 -0400 Subject: [PATCH 1/9] Don't track sphinx output. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index bc97193548..cfb4691bb3 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,7 @@ demos_community.rst .venv/ .venv-build/ **/*.egg-info/ +sg_execution_times.rst # Generated after installation .github/workflows/qml_pipeline_utils/build/ From 7b4260bc4de59163f6739b0cc98999dd3252fbe5 Mon Sep 17 00:00:00 2001 From: doctorperceptron Date: Thu, 10 Jul 2025 15:37:12 -0400 Subject: [PATCH 2/9] Build objects.inv file --- .github/workflows/v2-build-demos-swc-env.yml | 31 ++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/.github/workflows/v2-build-demos-swc-env.yml b/.github/workflows/v2-build-demos-swc-env.yml index 6d5893365c..fa5c005733 100644 --- a/.github/workflows/v2-build-demos-swc-env.yml +++ b/.github/workflows/v2-build-demos-swc-env.yml @@ -80,3 +80,34 @@ jobs: name: deployment_build_context path: /tmp/merge retention-days: 30 + + # Step 4: Build and upload the updated objects.inv file + build-objects-inv-file: + if: (needs.identify-changed-demos.outputs.updated != '') && ${{ github.ref_name == 'master' }} + runs-on: ubuntu-latest + needs: + - identify-changed-demos + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + ref: ${{ github.sha }} + fetch-depth: 1 + + - name: Install pandoc and opencl + run: | + sudo apt-get install -y \ + ocl-icd-opencl-dev \ + pandoc + + - name: Setup Python + uses: actions/setup-python@v4 + with: + python-version: '3.10' + + - name: Install dependencies + run: pip install . && poetry config warnings.export false + + - name: Build all demos in HTML format + run: | + qml build --format html --keep-going --no-quiet --no-dev From f54f10b380925f2074f9547aae4b0bf417922c91 Mon Sep 17 00:00:00 2001 From: doctorperceptron Date: Thu, 10 Jul 2025 16:11:15 -0400 Subject: [PATCH 3/9] Add secrets --- .github/workflows/v2-build-demos-swc-env.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/v2-build-demos-swc-env.yml b/.github/workflows/v2-build-demos-swc-env.yml index fa5c005733..e4fbdc5729 100644 --- a/.github/workflows/v2-build-demos-swc-env.yml +++ b/.github/workflows/v2-build-demos-swc-env.yml @@ -83,7 +83,15 @@ jobs: # Step 4: Build and upload the updated objects.inv file build-objects-inv-file: - if: (needs.identify-changed-demos.outputs.updated != '') && ${{ github.ref_name == 'master' }} + env: + AWS_REGION: ${{ secrets.AWS_REGION }} + # TODO: Change STAGING to PROD for the following secrets for release: + AWS_ACCESS_KEY_ID: ${{ secrets.PL_SITE_STAGING_NON_REACT_ACCESS_KEY_ID }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.PL_SITE_STAGING_NON_REACT_SECRET_ACCESS_KEY }} + AWS_S3_HTML_BUCKET_ID: ${{ secrets.PL_SITE_STAGING_S3_BUCKET_NAME }} + + # TODO: Change ref_name to 'master' for release + if: (needs.identify-changed-demos.outputs.updated != '') && ${{ github.ref_name == 'test-v2-master' }} runs-on: ubuntu-latest needs: - identify-changed-demos @@ -111,3 +119,6 @@ jobs: - name: Build all demos in HTML format run: | qml build --format html --keep-going --no-quiet --no-dev + + - name: Sync objects.inv to HTML Bucket + run: aws s3 cp ./_build/objects.inv s3://$AWS_S3_HTML_BUCKET_ID/qml/objects.inv From c493db92b3b489681989887f120991c14504e82c Mon Sep 17 00:00:00 2001 From: doctorperceptron Date: Thu, 10 Jul 2025 16:13:31 -0400 Subject: [PATCH 4/9] Add todo --- .github/workflows/v2-build-demos-swc-env.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/v2-build-demos-swc-env.yml b/.github/workflows/v2-build-demos-swc-env.yml index e4fbdc5729..25cd25edab 100644 --- a/.github/workflows/v2-build-demos-swc-env.yml +++ b/.github/workflows/v2-build-demos-swc-env.yml @@ -2,6 +2,7 @@ name: V2 Build Demos for SWC Environment on: push: + # TODO: Remove 'test-v2-master' and 'test-v2-dev' for release branches: - master - test-v2-master From 5c3e6e9d2a44846c0e9d40780427391ad45e7f66 Mon Sep 17 00:00:00 2001 From: doctorperceptron Date: Fri, 11 Jul 2025 09:54:58 -0400 Subject: [PATCH 5/9] Add dedicated objects.inv workflow --- .github/workflows/v2-sync-objects-dot-inv.yml | 69 +++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 .github/workflows/v2-sync-objects-dot-inv.yml diff --git a/.github/workflows/v2-sync-objects-dot-inv.yml b/.github/workflows/v2-sync-objects-dot-inv.yml new file mode 100644 index 0000000000..0b557a3249 --- /dev/null +++ b/.github/workflows/v2-sync-objects-dot-inv.yml @@ -0,0 +1,69 @@ +name: V2 Sync objects.inv +on: + workflow_call: + inputs: + branch: + description: The QML branch that is being built. + type: string + required: true + dev: + description: Use development dependencies. + required: false + type: boolean + default: false + + secrets: + aws_region: + description: The AWS Region the infrastructure resides in + required: true + aws_access_key_id: + description: AWS Access Key to use when accessing the S3 bucket + required: true + aws_secret_access_key: + description: AWS Secret Access Key to use when accessing the S3 bucket + required: true + aws_html_s3_bucket_id: + description: The S3 bucket ID where the objects.inv file will be pushed + required: true + + +jobs: + build-and-upload: + runs-on: ubuntu-latest + env: + AWS_REGION: ${{ secrets.aws_region }} + AWS_ACCESS_KEY_ID: ${{ secrets.aws_access_key_id }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.aws_secret_access_key }} + AWS_S3_HTML_BUCKET_ID: ${{ secrets.aws_html_s3_bucket_id }} + + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + ref: ${{ inputs.branch }} + fetch-depth: 1 + + - name: Install pandoc and opencl + run: | + sudo apt-get install -y \ + ocl-icd-opencl-dev \ + pandoc + + - name: Setup Python + uses: actions/setup-python@v4 + with: + python-version: '3.10' + + - name: Install dependencies + run: pip install . && poetry config warnings.export false + + - name: Build all demos in HTML format + run: | + qml build \ + --format html \ + --keep-going \ + --no-quiet \ + ${{ inputs.dev && '--dev' || '--no-dev' }} + + - name: Sync objects.inv to HTML Bucket + run: aws s3 cp ./_build/objects.inv s3://$AWS_S3_HTML_BUCKET_ID/qml/objects.inv From 7f85f477fdde909e08626569645c8e7b4405c5a4 Mon Sep 17 00:00:00 2001 From: doctorperceptron Date: Fri, 11 Jul 2025 10:05:16 -0400 Subject: [PATCH 6/9] Update swc-env workflow --- .github/workflows/v2-build-demos-swc-env.yml | 63 +++++++++----------- 1 file changed, 27 insertions(+), 36 deletions(-) diff --git a/.github/workflows/v2-build-demos-swc-env.yml b/.github/workflows/v2-build-demos-swc-env.yml index 25cd25edab..d4a0c36920 100644 --- a/.github/workflows/v2-build-demos-swc-env.yml +++ b/.github/workflows/v2-build-demos-swc-env.yml @@ -82,44 +82,35 @@ jobs: path: /tmp/merge retention-days: 30 - # Step 4: Build and upload the updated objects.inv file - build-objects-inv-file: - env: - AWS_REGION: ${{ secrets.AWS_REGION }} - # TODO: Change STAGING to PROD for the following secrets for release: - AWS_ACCESS_KEY_ID: ${{ secrets.PL_SITE_STAGING_NON_REACT_ACCESS_KEY_ID }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.PL_SITE_STAGING_NON_REACT_SECRET_ACCESS_KEY }} - AWS_S3_HTML_BUCKET_ID: ${{ secrets.PL_SITE_STAGING_S3_BUCKET_NAME }} + # Step 4: Build and upload the updated objects.inv files + build-objects-inv-file-dev: + # TODO: Change ref_name to 'dev' for release + if: (needs.identify-changed-demos.outputs.updated != '') && ${{ github.ref_name == 'test-v2-dev' }} + uses: ./.github/wokflows/v2-sync-objects-dot-inv.yml + needs: + - identify-changed-demos + with: + branch: ${{ github.ref }} + dev: true + secrets: + aws_region: ${{ secrets.AWS_REGION }} + aws_access_key_id: ${{ secrets.PL_SITE_DEV_NON_REACT_ACCESS_KEY_ID }} + aws_secret_access_key: ${{ secrets.PL_SITE_DEV_NON_REACT_SECRET_ACCESS_KEY }} + aws_html_s3_bucket_id: ${{ secrets.PL_SITE_DEV_S3_BUCKET_NAME }} + + build-objects-inv-file-master: # TODO: Change ref_name to 'master' for release if: (needs.identify-changed-demos.outputs.updated != '') && ${{ github.ref_name == 'test-v2-master' }} - runs-on: ubuntu-latest + uses: ./.github/wokflows/v2-sync-objects-dot-inv.yml needs: - identify-changed-demos - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - ref: ${{ github.sha }} - fetch-depth: 1 - - - name: Install pandoc and opencl - run: | - sudo apt-get install -y \ - ocl-icd-opencl-dev \ - pandoc - - - name: Setup Python - uses: actions/setup-python@v4 - with: - python-version: '3.10' - - - name: Install dependencies - run: pip install . && poetry config warnings.export false - - - name: Build all demos in HTML format - run: | - qml build --format html --keep-going --no-quiet --no-dev - - - name: Sync objects.inv to HTML Bucket - run: aws s3 cp ./_build/objects.inv s3://$AWS_S3_HTML_BUCKET_ID/qml/objects.inv + with: + branch: ${{ github.ref }} + + secrets: + # TODO: Change STAGING to PROD for release + aws_region: ${{ secrets.AWS_REGION }} + aws_access_key_id: ${{ secrets.PL_SITE_STAGING_NON_REACT_ACCESS_KEY_ID }} + aws_secret_access_key: ${{ secrets.PL_SITE_STAGING_NON_REACT_SECRET_ACCESS_KEY }} + aws_html_s3_bucket_id: ${{ secrets.PL_SITE_STAGING_S3_BUCKET_NAME }} From 31e3e5b4fff3469c4abba39556fa167af279c32d Mon Sep 17 00:00:00 2001 From: doctorperceptron Date: Fri, 11 Jul 2025 10:22:34 -0400 Subject: [PATCH 7/9] force build From eb0b69cedad62ab53f273f11a64adc686010a356 Mon Sep 17 00:00:00 2001 From: doctorperceptron Date: Fri, 11 Jul 2025 10:40:44 -0400 Subject: [PATCH 8/9] Fix typo --- .github/workflows/v2-build-demos-swc-env.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/v2-build-demos-swc-env.yml b/.github/workflows/v2-build-demos-swc-env.yml index d4a0c36920..0b83d4419c 100644 --- a/.github/workflows/v2-build-demos-swc-env.yml +++ b/.github/workflows/v2-build-demos-swc-env.yml @@ -86,7 +86,7 @@ jobs: build-objects-inv-file-dev: # TODO: Change ref_name to 'dev' for release if: (needs.identify-changed-demos.outputs.updated != '') && ${{ github.ref_name == 'test-v2-dev' }} - uses: ./.github/wokflows/v2-sync-objects-dot-inv.yml + uses: ./.github/workflows/v2-sync-objects-dot-inv.yml needs: - identify-changed-demos with: From 68734d4acd824ff1d693839750e8cdae9a0da31c Mon Sep 17 00:00:00 2001 From: doctorperceptron Date: Fri, 11 Jul 2025 10:41:35 -0400 Subject: [PATCH 9/9] Fix typo --- .github/workflows/v2-build-demos-swc-env.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/v2-build-demos-swc-env.yml b/.github/workflows/v2-build-demos-swc-env.yml index 0b83d4419c..1945c5894a 100644 --- a/.github/workflows/v2-build-demos-swc-env.yml +++ b/.github/workflows/v2-build-demos-swc-env.yml @@ -102,7 +102,7 @@ jobs: build-objects-inv-file-master: # TODO: Change ref_name to 'master' for release if: (needs.identify-changed-demos.outputs.updated != '') && ${{ github.ref_name == 'test-v2-master' }} - uses: ./.github/wokflows/v2-sync-objects-dot-inv.yml + uses: ./.github/workflows/v2-sync-objects-dot-inv.yml needs: - identify-changed-demos with: