From 18d5c77392964ee417ba563084fe8335cb90a11c Mon Sep 17 00:00:00 2001 From: Mridula <66699525+mpeddada1@users.noreply.github.com> Date: Fri, 19 Jul 2024 14:53:26 -0400 Subject: [PATCH 1/2] fix: address windows deadlock issue when determining docker environment info (#4288) --- .../com/google/cloud/tools/jib/docker/CliDockerClient.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jib-core/src/main/java/com/google/cloud/tools/jib/docker/CliDockerClient.java b/jib-core/src/main/java/com/google/cloud/tools/jib/docker/CliDockerClient.java index 1842a79de3..d3dcecd883 100644 --- a/jib-core/src/main/java/com/google/cloud/tools/jib/docker/CliDockerClient.java +++ b/jib-core/src/main/java/com/google/cloud/tools/jib/docker/CliDockerClient.java @@ -189,11 +189,12 @@ public boolean supported(Map parameters) { public DockerInfoDetails info() throws IOException, InterruptedException { // Runs 'docker info'. Process infoProcess = docker("info", "-f", "{{json .}}"); + InputStream inputStream = infoProcess.getInputStream(); if (infoProcess.waitFor() != 0) { throw new IOException( "'docker info' command failed with error: " + getStderrOutput(infoProcess)); } - return JsonTemplateMapper.readJson(infoProcess.getInputStream(), DockerInfoDetails.class); + return JsonTemplateMapper.readJson(inputStream, DockerInfoDetails.class); } @Override From 45610ea5e6e29b6feb93fea2e186db91be514002 Mon Sep 17 00:00:00 2001 From: Mridula <66699525+mpeddada1@users.noreply.github.com> Date: Wed, 14 Aug 2024 13:05:22 -0400 Subject: [PATCH 2/2] chore: update release workflow (#4292) Co-authored-by: Blake Li --- .github/workflows/jib-cli-release.yml | 4 +--- .github/workflows/prepare-release.yml | 6 +----- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/jib-cli-release.yml b/.github/workflows/jib-cli-release.yml index db857d627b..2284e1f78e 100644 --- a/.github/workflows/jib-cli-release.yml +++ b/.github/workflows/jib-cli-release.yml @@ -56,9 +56,7 @@ jobs: uses: repo-sync/pull-request@v2.12.1 id: create-pr with: - # Use a personal token to file a PR as a non-bot author to trigger other workflows (e.g., unit tests): - # https://docs.github.com/en/actions/reference/events-that-trigger-workflows#triggering-new-workflows-using-a-personal-access-token; - github_token: ${{ secrets.GA_RELEASE_PR_PERSONAL_TOKEN }} + github_token: ${{ secrets.CLOUD_JAVA_BOT_GITHUB_TOKEN }} source_branch: cli-release-v${{ github.event.inputs.release_version }} pr_title: "CLI release v${{ github.event.inputs.release_version }}" pr_body: "To be merged after the release is complete." diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml index 6a2fc0635c..0248584a91 100644 --- a/.github/workflows/prepare-release.yml +++ b/.github/workflows/prepare-release.yml @@ -62,11 +62,7 @@ jobs: uses: repo-sync/pull-request@v2.12.1 id: create-pr with: - # Use a personal token to file a PR to trigger other workflows (e.g., unit tests). - # Save your access token as GA_RELEASE_PR_PERSONAL_TOKEN. - # https://docs.github.com/en/actions/reference/events-that-trigger-workflows#triggering-new-workflows-using-a-personal-access-token - # https://docs.github.com/en/actions/configuring-and-managing-workflows/creating-and-storing-encrypted-secrets - github_token: ${{ secrets.GA_RELEASE_PR_PERSONAL_TOKEN }} + github_token: ${{ secrets.CLOUD_JAVA_BOT_GITHUB_TOKEN }} source_branch: ${{ github.event.inputs.project }}-release-v${{ github.event.inputs.release_version }} pr_title: "${{ github.event.inputs.project }} release v${{ github.event.inputs.release_version }}" pr_body: "To be merged after the release is complete."