From fc459d44109f1cd188ed20a65ce3b5d6eb5524b1 Mon Sep 17 00:00:00 2001 From: Philippe Wang Date: Thu, 14 Dec 2023 11:19:52 -0800 Subject: [PATCH 1/2] do not merge: for testing purposes --- .../ci/jobs/prepare_release/docker_merge_manifests_release.yml | 3 --- .../ci/jobs/prepare_release/docker_merge_manifests_test.yml | 3 --- 2 files changed, 6 deletions(-) diff --git a/.gitlab/ci/jobs/prepare_release/docker_merge_manifests_release.yml b/.gitlab/ci/jobs/prepare_release/docker_merge_manifests_release.yml index d8a8fa57aabe..3dae5b95fbc5 100644 --- a/.gitlab/ci/jobs/prepare_release/docker_merge_manifests_release.yml +++ b/.gitlab/ci/jobs/prepare_release/docker_merge_manifests_release.yml @@ -10,9 +10,6 @@ docker:merge_manifests: extends: - .docker_auth_template - .image_template__docker - needs: - - oc.docker:amd64 - - oc.docker:arm64 stage: prepare_release variables: CI_DOCKER_HUB: "true" diff --git a/.gitlab/ci/jobs/prepare_release/docker_merge_manifests_test.yml b/.gitlab/ci/jobs/prepare_release/docker_merge_manifests_test.yml index 37f70b7c661c..17b69b2aff45 100644 --- a/.gitlab/ci/jobs/prepare_release/docker_merge_manifests_test.yml +++ b/.gitlab/ci/jobs/prepare_release/docker_merge_manifests_test.yml @@ -10,9 +10,6 @@ docker:merge_manifests: extends: - .docker_auth_template - .image_template__docker - needs: - - oc.docker:amd64 - - oc.docker:arm64 stage: prepare_release variables: CI_DOCKER_HUB: "false" -- GitLab From 6c9f4650ceb72d93cfb83d4e171aeb875bbfd4cb Mon Sep 17 00:00:00 2001 From: Philippe Wang Date: Wed, 29 Nov 2023 14:15:17 -0800 Subject: [PATCH 2/2] CI: dummy change to docs/ - do not merge this --- docs/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.rst b/docs/index.rst index 1ebc52a81287..62c3378c8791 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -129,7 +129,7 @@ Platform developers are also provided reference materials for internal APIs of O - The :doc:`API of OCaml libraries and modules ` reference - The :doc:`shell/p2p_api` reference -- The :doc:`developer/merkle-proof-encoding-formats` reference. +- The :doc:`developer/merkle-proof-encoding-formats` reference. (dummy change, don't merge me) .. raw:: html -- GitLab