From c9128979125456106882faf145a760ba08e97263 Mon Sep 17 00:00:00 2001 From: Bettina Heim Date: Wed, 13 Nov 2024 13:24:09 +0100 Subject: [PATCH 1/3] allow to set manually created publishing assets as repo variable Signed-off-by: Bettina Heim --- .github/workflows/publishing.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/publishing.yml b/.github/workflows/publishing.yml index 0b62414353..a6e95d0b89 100644 --- a/.github/workflows/publishing.yml +++ b/.github/workflows/publishing.yml @@ -163,13 +163,14 @@ jobs: # Using the image sha as the file name and the docker image name # as the folder is convenient for the GitLab CI. - if ${{ inputs.manual_assets_creation == '' }}; then + publishing_assets=${{ inputs.manual_assets_creation || vars.publishing_assets || '' }} + if [ -z "${publishing_assets}" ]; then git config --global user.name "cuda-quantum-bot" git config --global user.email "cuda-quantum-bot@users.noreply.github.com" current_branch=$(git rev-parse --abbrev-ref HEAD) else - gh release download ${{ inputs.manual_assets_creation }} -R ${{ vars.assets_repo || github.repository }} - unzip -d /tmp/ ${{ inputs.manual_assets_creation }}.zip && rm -rf ${{ inputs.manual_assets_creation }}.zip + gh release download ${publishing_assets} -R ${{ vars.assets_repo || github.repository }} + unzip -d /tmp/ ${publishing_assets}.zip && rm -rf ${publishing_assets}.zip fi function create_assets { @@ -190,7 +191,7 @@ jobs: echo "release-id: $release_id" >> "$1.txt" echo "artifacts-url: $artifacts_url" >> "$1.txt" - if ${{ inputs.manual_assets_creation == '' }}; then + if [ -z "${publishing_assets}" ]; then echo "Pushing $1 to $staging_branch" mkdir -p "$staging_folder" && mv -v "$1.txt" "$staging_folder/$file_id" git add "$staging_folder" && git commit -m "$image_hash" @@ -217,7 +218,7 @@ jobs: fi assets_folder=$(echo $release_id | cut -d _ -f2-) - upload=`find /tmp/${{ inputs.manual_assets_creation }}/$assets_folder -name '*.zip'` + upload=`find /tmp/${publishing_assets}/$assets_folder -name '*.zip'` echo "Uploading assets $upload $1.txt..." echo $upload | xargs gh release upload $release_id -R ${{ vars.assets_repo || github.repository }} --clobber "$1.txt" fi @@ -249,7 +250,7 @@ jobs: # We can delete staging branch now after the expected draft releases have been created. - name: Clean up - if: steps.assets_creation.outcome != 'skipped' && inputs.manual_assets_creation == '' + if: steps.assets_creation.outcome != 'skipped' && inputs.manual_assets_creation == '' && vars.publishing_assets == '' run: | # Clean up the staging branch that was used to trigger the GitLab pipeline. git config --global user.name "cuda-quantum-bot" From 41b693565658a1737e23f85dfcef4bb8c46d354b Mon Sep 17 00:00:00 2001 From: Bettina Heim Date: Wed, 13 Nov 2024 14:05:43 +0100 Subject: [PATCH 2/3] fixing the nightly tests Signed-off-by: Bettina Heim --- .github/ISSUE_TEMPLATE/bug_report.yaml | 6 +++--- .github/ISSUE_TEMPLATE/feature_request.yaml | 2 +- .github/pull_request_template.md | 2 +- .github/workflows/integration_tests.yml | 8 ++++---- .github/workflows/nvqc_regression_tests.yml | 8 ++++---- .licenserc.yaml | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml index c961ffa094..543beefe2b 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/bug_report.yaml @@ -5,7 +5,7 @@ labels: [triage] body: - type: markdown attributes: - value: Thank you for helping us improve CUDA Quantum. + value: Thank you for helping us improve CUDA-Q. - type: checkboxes attributes: @@ -60,7 +60,7 @@ body: attributes: label: Environment description: | - For the CUDA Quantum version, please give the actual version number + For the CUDA-Q version, please give the actual version number (_e.g._ 0.3.0) if you are using a release version, or the first 7-8 characters of the commit hash if you have built from source. If you are using the python interface _and_ have not built it from source, you can @@ -69,7 +69,7 @@ body: is relevant to the list. # Keep the trailing spaces on the following lines value: | - - **CUDA Quantum version**: + - **CUDA-Q version**: - **Python version**: - **C++ compiler**: - **Operating system**: diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml index 5a938951ae..481afe21e7 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yaml +++ b/.github/ISSUE_TEMPLATE/feature_request.yaml @@ -5,7 +5,7 @@ labels: [enhancement] body: - type: markdown attributes: - value: Thank you for helping us improve CUDA Quantum. + value: Thank you for helping us improve CUDA-Q. - type: checkboxes attributes: diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index e20074e625..52e6d84395 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,5 +1,5 @@