From c964bb8e7585027a746829835ed84bae967afff6 Mon Sep 17 00:00:00 2001 From: Vincent Michaud-Rioux Date: Tue, 9 Jul 2024 11:24:33 -0400 Subject: [PATCH 1/6] Fix docker push --- .github/workflows/docker_linux_x86_64.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker_linux_x86_64.yml b/.github/workflows/docker_linux_x86_64.yml index c9bb35ca39..32c94b3e15 100644 --- a/.github/workflows/docker_linux_x86_64.yml +++ b/.github/workflows/docker_linux_x86_64.yml @@ -81,9 +81,9 @@ jobs: - name: Build and push version uses: docker/build-push-action@v5 - if: ${{ inputs.push-to-dockerhub == 'true' }} + if: ${{ inputs.push-to-dockerhub }} with: - push: ${{ inputs.push-to-dockerhub }} + push: false context: . file: docker/Dockerfile tags: pennylaneai/pennylane:${{ inputs.lightning-version }}-${{ matrix.pl_backend }} @@ -94,9 +94,9 @@ jobs: - name: Build and push latest uses: docker/build-push-action@v5 - if: ${{ inputs.push-to-dockerhub == 'true' }} + if: ${{ inputs.push-to-dockerhub }} with: - push: ${{ inputs.push-to-dockerhub }} + push: false context: . file: docker/Dockerfile tags: pennylaneai/pennylane:latest-${{ matrix.pl_backend }} From 30c0535f93443000b4a4679396a3a47f634f0b64 Mon Sep 17 00:00:00 2001 From: Vincent Michaud-Rioux Date: Tue, 9 Jul 2024 11:32:50 -0400 Subject: [PATCH 2/6] Revert push value --- .github/workflows/docker_linux_x86_64.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker_linux_x86_64.yml b/.github/workflows/docker_linux_x86_64.yml index 32c94b3e15..2b077e87fd 100644 --- a/.github/workflows/docker_linux_x86_64.yml +++ b/.github/workflows/docker_linux_x86_64.yml @@ -83,7 +83,7 @@ jobs: uses: docker/build-push-action@v5 if: ${{ inputs.push-to-dockerhub }} with: - push: false + push: ${{ inputs.push-to-dockerhub }} context: . file: docker/Dockerfile tags: pennylaneai/pennylane:${{ inputs.lightning-version }}-${{ matrix.pl_backend }} @@ -96,7 +96,7 @@ jobs: uses: docker/build-push-action@v5 if: ${{ inputs.push-to-dockerhub }} with: - push: false + push: ${{ inputs.push-to-dockerhub }} context: . file: docker/Dockerfile tags: pennylaneai/pennylane:latest-${{ matrix.pl_backend }} From 05e7b76b2acd95337881d13409434703be65a1d9 Mon Sep 17 00:00:00 2001 From: ringo-but-quantum Date: Tue, 9 Jul 2024 15:34:38 +0000 Subject: [PATCH 3/6] Auto update version from '0.38.0-dev3' to '0.38.0-dev4' --- pennylane_lightning/core/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pennylane_lightning/core/_version.py b/pennylane_lightning/core/_version.py index 495216b173..5d317504f4 100644 --- a/pennylane_lightning/core/_version.py +++ b/pennylane_lightning/core/_version.py @@ -16,4 +16,4 @@ Version number (major.minor.patch[-label]) """ -__version__ = "0.38.0-dev3" +__version__ = "0.38.0-dev4" From 7841a1b61c9482ae1f7613afc092b8da7304b02d Mon Sep 17 00:00:00 2001 From: Vincent Michaud-Rioux Date: Tue, 9 Jul 2024 11:36:06 -0400 Subject: [PATCH 4/6] Update changelog. --- .github/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md index f335e2397f..bbca7e9649 100644 --- a/.github/CHANGELOG.md +++ b/.github/CHANGELOG.md @@ -8,6 +8,7 @@ [(#788)](https://github.com/PennyLaneAI/pennylane-lightning/pull/788) ### Improvements + * Add a Catalyst-specific wrapping class for Lightning Kokkos. [(#770)](https://github.com/PennyLaneAI/pennylane-lightning/pull/770) @@ -15,6 +16,9 @@ ### Bug fixes +* Fix conditions for skipping build & push steps in the Docker build workflows. + [(#790)](https://github.com/PennyLaneAI/pennylane-lightning/pull/790) + * Downgrade Scipy on Lightning stable version tests. [(#783)](https://github.com/PennyLaneAI/pennylane-lightning/pull/783) From 9b184d9cd73f741a37e7a1e5f7b7ee36bccb0940 Mon Sep 17 00:00:00 2001 From: Vincent Michaud-Rioux Date: Tue, 9 Jul 2024 11:42:22 -0400 Subject: [PATCH 5/6] trigger ci From 933e488cc1ba349e3514a910a13603526e0cdc96 Mon Sep 17 00:00:00 2001 From: Vincent Michaud-Rioux Date: Tue, 9 Jul 2024 11:44:42 -0400 Subject: [PATCH 6/6] Merge tags --- .github/workflows/docker_linux_x86_64.yml | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/.github/workflows/docker_linux_x86_64.yml b/.github/workflows/docker_linux_x86_64.yml index 2b077e87fd..0ce9fdb95f 100644 --- a/.github/workflows/docker_linux_x86_64.yml +++ b/.github/workflows/docker_linux_x86_64.yml @@ -86,20 +86,7 @@ jobs: push: ${{ inputs.push-to-dockerhub }} context: . file: docker/Dockerfile - tags: pennylaneai/pennylane:${{ inputs.lightning-version }}-${{ matrix.pl_backend }} - target: wheel-${{ matrix.pl_backend }} - build-args: | - LIGHTNING_VERSION=${{ inputs.lightning-version }} - PENNYLANE_VERSION=${{ inputs.pennylane-version }} - - - name: Build and push latest - uses: docker/build-push-action@v5 - if: ${{ inputs.push-to-dockerhub }} - with: - push: ${{ inputs.push-to-dockerhub }} - context: . - file: docker/Dockerfile - tags: pennylaneai/pennylane:latest-${{ matrix.pl_backend }} + tags: pennylaneai/pennylane:${{ inputs.lightning-version }}-${{ matrix.pl_backend }},pennylaneai/pennylane:latest-${{ matrix.pl_backend }} target: wheel-${{ matrix.pl_backend }} build-args: | LIGHTNING_VERSION=${{ inputs.lightning-version }}