From e4e994d7757ea25cee028eedab0e52c9906e52b6 Mon Sep 17 00:00:00 2001 From: ldetmer <1771267+ldetmer@users.noreply.github.com> Date: Fri, 18 Apr 2025 11:52:40 -0400 Subject: [PATCH 01/10] fix: remove pip script and try using default version Currently we are using this script, which is now throwing an error: https://bootstrap.pypa.io/pip/3.6/get-pip.py --- .github/workflows/generate.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/generate.yaml b/.github/workflows/generate.yaml index 5ca02841f2d..dbf54b1885f 100644 --- a/.github/workflows/generate.yaml +++ b/.github/workflows/generate.yaml @@ -36,8 +36,7 @@ jobs: sudo apt update sudo apt install python3 echo "using $(python3 --version)" - curl https://bootstrap.pypa.io/pip/3.6/get-pip.py -o get-pip.py - python3 get-pip.py + echo "using $(pip --version)" - run: ./google-api-java-client-services/.github/workflows/generate.sh ${{ matrix.service }} - uses: googleapis/code-suggester@v2 # takes the changes from git directory env: From 8ba961c810354b18694fb262e4a07b03b19e37aa Mon Sep 17 00:00:00 2001 From: ldetmer <1771267+ldetmer@users.noreply.github.com> Date: Fri, 18 Apr 2025 13:19:20 -0400 Subject: [PATCH 02/10] test python version --- .github/workflows/generate.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/generate.yaml b/.github/workflows/generate.yaml index dbf54b1885f..3e0685fdea2 100644 --- a/.github/workflows/generate.yaml +++ b/.github/workflows/generate.yaml @@ -32,11 +32,13 @@ jobs: repository: googleapis/discovery-artifact-manager fetch-depth: 1 path: discovery-artifact-manager + - uses: actions/setup-python@v5 + with: + python-version: 3.6 - run: | sudo apt update - sudo apt install python3 - echo "using $(python3 --version)" - echo "using $(pip --version)" + python3 --version + pip --version - run: ./google-api-java-client-services/.github/workflows/generate.sh ${{ matrix.service }} - uses: googleapis/code-suggester@v2 # takes the changes from git directory env: From 9de0e5cc03e66f1a72726749fdd34361817950e8 Mon Sep 17 00:00:00 2001 From: ldetmer <1771267+ldetmer@users.noreply.github.com> Date: Fri, 18 Apr 2025 13:20:32 -0400 Subject: [PATCH 03/10] fix spacing --- .github/workflows/generate.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/generate.yaml b/.github/workflows/generate.yaml index 3e0685fdea2..efefb97236b 100644 --- a/.github/workflows/generate.yaml +++ b/.github/workflows/generate.yaml @@ -33,8 +33,8 @@ jobs: fetch-depth: 1 path: discovery-artifact-manager - uses: actions/setup-python@v5 - with: - python-version: 3.6 + with: + python-version: 3.6 - run: | sudo apt update python3 --version From f44d340ca211cb15357c14183c2498b00c682836 Mon Sep 17 00:00:00 2001 From: ldetmer <1771267+ldetmer@users.noreply.github.com> Date: Fri, 18 Apr 2025 13:38:27 -0400 Subject: [PATCH 04/10] Update generate.yaml --- .github/workflows/generate.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/generate.yaml b/.github/workflows/generate.yaml index efefb97236b..fa2df92a537 100644 --- a/.github/workflows/generate.yaml +++ b/.github/workflows/generate.yaml @@ -32,11 +32,9 @@ jobs: repository: googleapis/discovery-artifact-manager fetch-depth: 1 path: discovery-artifact-manager - - uses: actions/setup-python@v5 - with: - python-version: 3.6 - run: | sudo apt update + sudo install python3 python3 --version pip --version - run: ./google-api-java-client-services/.github/workflows/generate.sh ${{ matrix.service }} From 61d6c354fa90a725f43c653df8def811a12399e8 Mon Sep 17 00:00:00 2001 From: ldetmer <1771267+ldetmer@users.noreply.github.com> Date: Fri, 18 Apr 2025 13:43:37 -0400 Subject: [PATCH 05/10] Update generate.yaml --- .github/workflows/generate.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/generate.yaml b/.github/workflows/generate.yaml index fa2df92a537..a447fa75a11 100644 --- a/.github/workflows/generate.yaml +++ b/.github/workflows/generate.yaml @@ -34,7 +34,7 @@ jobs: path: discovery-artifact-manager - run: | sudo apt update - sudo install python3 + sudo apt install python3 python3 --version pip --version - run: ./google-api-java-client-services/.github/workflows/generate.sh ${{ matrix.service }} From d0695a61fd343d0bdfc8de0a5c9fbbe3f7088048 Mon Sep 17 00:00:00 2001 From: ldetmer <1771267+ldetmer@users.noreply.github.com> Date: Fri, 18 Apr 2025 13:53:12 -0400 Subject: [PATCH 06/10] Update generate.yaml --- .github/workflows/generate.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/generate.yaml b/.github/workflows/generate.yaml index a447fa75a11..226acc70405 100644 --- a/.github/workflows/generate.yaml +++ b/.github/workflows/generate.yaml @@ -36,6 +36,7 @@ jobs: sudo apt update sudo apt install python3 python3 --version + pip install pip==21.3.1 pip --version - run: ./google-api-java-client-services/.github/workflows/generate.sh ${{ matrix.service }} - uses: googleapis/code-suggester@v2 # takes the changes from git directory From defcba3b957281f2839a65274e319079c56fa211 Mon Sep 17 00:00:00 2001 From: ldetmer <1771267+ldetmer@users.noreply.github.com> Date: Fri, 18 Apr 2025 14:09:54 -0400 Subject: [PATCH 07/10] Update generate.yaml --- .github/workflows/generate.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/generate.yaml b/.github/workflows/generate.yaml index 226acc70405..cbf6d631cc9 100644 --- a/.github/workflows/generate.yaml +++ b/.github/workflows/generate.yaml @@ -32,9 +32,11 @@ jobs: repository: googleapis/discovery-artifact-manager fetch-depth: 1 path: discovery-artifact-manager + - uses: actions/setup-python@v5 + with: + python-version: 3.8.10 - run: | sudo apt update - sudo apt install python3 python3 --version pip install pip==21.3.1 pip --version From 278a7ed7362f7cfb59510500e51f84559f190f70 Mon Sep 17 00:00:00 2001 From: ldetmer <1771267+ldetmer@users.noreply.github.com> Date: Fri, 18 Apr 2025 14:18:22 -0400 Subject: [PATCH 08/10] Update generate.yaml --- .github/workflows/generate.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/generate.yaml b/.github/workflows/generate.yaml index cbf6d631cc9..171d2552ca9 100644 --- a/.github/workflows/generate.yaml +++ b/.github/workflows/generate.yaml @@ -15,7 +15,7 @@ on: name: generate jobs: generate_one: - runs-on: 'ubuntu-24.04' + runs-on: 'ubuntu-20.04' strategy: fail-fast: false max-parallel: 4 From 88a4204bc35b08b97820a26da4578d02b9e48f03 Mon Sep 17 00:00:00 2001 From: ldetmer <1771267+ldetmer@users.noreply.github.com> Date: Fri, 18 Apr 2025 14:22:04 -0400 Subject: [PATCH 09/10] Update generate.yaml --- .github/workflows/generate.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/generate.yaml b/.github/workflows/generate.yaml index 171d2552ca9..6bd7608420e 100644 --- a/.github/workflows/generate.yaml +++ b/.github/workflows/generate.yaml @@ -15,7 +15,7 @@ on: name: generate jobs: generate_one: - runs-on: 'ubuntu-20.04' + runs-on: 'ubuntu-22.04' strategy: fail-fast: false max-parallel: 4 @@ -34,7 +34,7 @@ jobs: path: discovery-artifact-manager - uses: actions/setup-python@v5 with: - python-version: 3.8.10 + python-version: 3.8.18 - run: | sudo apt update python3 --version From 698b759e17e12d654d339ad8d337b2c91b04c4f6 Mon Sep 17 00:00:00 2001 From: ldetmer <1771267+ldetmer@users.noreply.github.com> Date: Fri, 18 Apr 2025 14:31:38 -0400 Subject: [PATCH 10/10] Update generate.yaml --- .github/workflows/generate.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/generate.yaml b/.github/workflows/generate.yaml index 6bd7608420e..3961c0bddb8 100644 --- a/.github/workflows/generate.yaml +++ b/.github/workflows/generate.yaml @@ -15,7 +15,7 @@ on: name: generate jobs: generate_one: - runs-on: 'ubuntu-22.04' + runs-on: 'ubuntu-24.04' strategy: fail-fast: false max-parallel: 4