Skip to content

Commit 0b3fa13

Browse files
adchiaadchia
committed
ci: Fix ci breakage from old pip version being restored from pip cache
Signed-off-by: Danny C <[email protected]>
1 parent 58aff34 commit 0b3fa13

11 files changed

+33
-35
lines changed

‎.github/fork_workflows/fork_pr_integration_tests_aws.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,6 @@ jobs:
109109
aws-region: us-west-2
110110
- name: Use AWS CLI
111111
run: aws sts get-caller-identity
112-
- name: Upgrade pip version
113-
run: |
114-
pip install --upgrade "pip>=21.3.1,<22.3"
115112
- name: Get pip cache dir
116113
id: pip-cache
117114
run: |
@@ -126,6 +123,9 @@ jobs:
126123
key: ${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-pip-${{ hashFiles(format('**/py{0}-ci-requirements.txt', env.PYTHON)) }}
127124
restore-keys: |
128125
${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-pip-
126+
- name: Upgrade pip version
127+
run: |
128+
pip install --upgrade "pip>=21.3.1,<22.3"
129129
- name: Install pip-tools
130130
run: pip install pip-tools
131131
- name: Install apache-arrow on ubuntu

‎.github/fork_workflows/fork_pr_integration_tests_gcp.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,6 @@ jobs:
5353
project_id: ${{ secrets.GCP_PROJECT_ID }}
5454
- name: Use gcloud CLI
5555
run: gcloud info
56-
- name: Upgrade pip version
57-
run: |
58-
pip install --upgrade "pip>=21.3.1,<23.2"
5956
- name: Get pip cache dir
6057
id: pip-cache
6158
run: |
@@ -70,6 +67,9 @@ jobs:
7067
key: ${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-pip-${{ hashFiles(format('**/py{0}-ci-requirements.txt', env.PYTHON)) }}
7168
restore-keys: |
7269
${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-pip-
70+
- name: Upgrade pip version
71+
run: |
72+
pip install --upgrade "pip>=21.3.1,<23.2"
7373
- name: Install pip-tools
7474
run: pip install pip-tools
7575
- name: Install apache-arrow on ubuntu

‎.github/fork_workflows/fork_pr_integration_tests_snowflake.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,6 @@ jobs:
4343
uses: actions/setup-go@v2
4444
with:
4545
go-version: 1.18.0
46-
47-
- name: Upgrade pip version
48-
run: |
49-
pip install --upgrade "pip>=21.3.1,<23.2"
5046
- name: Get pip cache dir
5147
id: pip-cache
5248
run: |
@@ -61,6 +57,9 @@ jobs:
6157
key: ${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-pip-${{ hashFiles(format('**/py{0}-ci-requirements.txt', env.PYTHON)) }}
6258
restore-keys: |
6359
${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-pip-
60+
- name: Upgrade pip version
61+
run: |
62+
pip install --upgrade "pip>=21.3.1,<23.2"
6463
- name: Install pip-tools
6564
run: pip install pip-tools
6665
- name: Install apache-arrow on ubuntu

‎.github/workflows/java_master_only.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,6 @@ jobs:
112112
with:
113113
python-version: 3.8
114114
architecture: x64
115-
- name: Upgrade pip version
116-
run: |
117-
pip install --upgrade "pip>=21.3.1,<23.2"
118115
- name: Get pip cache dir
119116
id: pip-cache
120117
run: |
@@ -129,9 +126,11 @@ jobs:
129126
key: ${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-pip-${{ hashFiles(format('**/py{0}-ci-requirements.txt', env.PYTHON)) }}
130127
restore-keys: |
131128
${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-pip-
129+
- name: Upgrade pip version
130+
run: |
131+
pip install --upgrade "pip>=21.3.1,<23.2"
132132
- name: Install pip-tools
133133
run: pip install pip-tools
134-
135134
- name: Install Python dependencies
136135
run: make install-python-ci-dependencies
137136
- uses: actions/cache@v2

‎.github/workflows/java_pr.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,9 +148,6 @@ jobs:
148148
with:
149149
python-version: 3.8
150150
architecture: x64
151-
- name: Upgrade pip version
152-
run: |
153-
pip install --upgrade "pip>=21.3.1,<23.2"
154151
- name: Get pip cache dir
155152
id: pip-cache
156153
run: |
@@ -165,6 +162,9 @@ jobs:
165162
key: ${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-pip-${{ hashFiles(format('**/py{0}-ci-requirements.txt', env.PYTHON)) }}
166163
restore-keys: |
167164
${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-pip-
165+
- name: Upgrade pip version
166+
run: |
167+
pip install --upgrade "pip>=21.3.1,<23.2"
168168
- name: Install pip-tools
169169
run: pip install pip-tools
170170
- name: Install Python dependencies

‎.github/workflows/linter.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ jobs:
1515
with:
1616
python-version: "3.8"
1717
architecture: x64
18-
- name: Upgrade pip version
19-
run: |
20-
pip install --upgrade "pip>=21.3.1,<23.2"
2118
- name: Get pip cache dir
2219
id: pip-cache
2320
run: |
@@ -32,6 +29,9 @@ jobs:
3229
key: ${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-pip-${{ hashFiles(format('**/py{0}-ci-requirements.txt', env.PYTHON)) }}
3330
restore-keys: |
3431
${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-pip-
32+
- name: Upgrade pip version
33+
run: |
34+
pip install --upgrade "pip>=21.3.1,<23.2"
3535
- name: Install pip-tools
3636
run: pip install pip-tools
3737
- name: Install dependencies

‎.github/workflows/master_only.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,6 @@ jobs:
106106
aws-region: us-west-2
107107
- name: Use AWS CLI
108108
run: aws sts get-caller-identity
109-
- name: Upgrade pip version
110-
run: |
111-
pip install --upgrade "pip>=21.3.1,<23.2"
112109
- name: Get pip cache dir
113110
id: pip-cache
114111
run: |
@@ -123,6 +120,9 @@ jobs:
123120
key: ${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-pip-${{ hashFiles(format('**/py{0}-ci-requirements.txt', env.PYTHON)) }}
124121
restore-keys: |
125122
${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-pip-
123+
- name: Upgrade pip version
124+
run: |
125+
pip install --upgrade "pip>=21.3.1,<23.2"
126126
- name: Install pip-tools
127127
run: pip install pip-tools
128128
- name: Install dependencies

‎.github/workflows/nightly-ci.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,6 @@ jobs:
173173
aws-region: us-west-2
174174
- name: Use AWS CLI
175175
run: aws sts get-caller-identity
176-
- name: Upgrade pip version
177-
run: |
178-
pip install --upgrade "pip>=21.3.1,<23.2"
179176
- name: Get pip cache dir
180177
id: pip-cache
181178
run: |
@@ -190,6 +187,9 @@ jobs:
190187
key: ${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-pip-${{ hashFiles(format('**/py{0}-ci-requirements.txt', env.PYTHON)) }}
191188
restore-keys: |
192189
${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-pip-
190+
- name: Upgrade pip version
191+
run: |
192+
pip install --upgrade "pip>=21.3.1,<23.2"
193193
- name: Install pip-tools
194194
run: pip install pip-tools
195195
- name: Install apache-arrow on ubuntu

‎.github/workflows/pr_integration_tests.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,6 @@ jobs:
133133
aws-region: us-west-2
134134
- name: Use AWS CLI
135135
run: aws sts get-caller-identity
136-
- name: Upgrade pip version
137-
run: |
138-
pip install --upgrade "pip>=21.3.1,<23.2"
139136
- name: Get pip cache dir
140137
id: pip-cache
141138
run: |
@@ -150,6 +147,9 @@ jobs:
150147
key: ${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-pip-${{ hashFiles(format('**/py{0}-ci-requirements.txt', env.PYTHON)) }}
151148
restore-keys: |
152149
${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-pip-
150+
- name: Upgrade pip version
151+
run: |
152+
pip install --upgrade "pip>=21.3.1,<23.2"
153153
- name: Install pip-tools
154154
run: pip install pip-tools
155155
- name: Install dependencies

‎.github/workflows/pr_local_integration_tests.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@ jobs:
3838
with:
3939
python-version: ${{ matrix.python-version }}
4040
architecture: x64
41-
- name: Upgrade pip version
42-
run: |
43-
pip install --upgrade "pip>=21.3.1,<23.2"
4441
- name: Get pip cache dir
4542
id: pip-cache
4643
run: |
@@ -55,6 +52,9 @@ jobs:
5552
key: ${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-pip-${{ hashFiles(format('**/py{0}-ci-requirements.txt', env.PYTHON)) }}
5653
restore-keys: |
5754
${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-pip-
55+
- name: Upgrade pip version
56+
run: |
57+
pip install --upgrade "pip>=21.3.1,<23.2"
5858
- name: Install pip-tools
5959
run: pip install pip-tools
6060
- name: Install dependencies

0 commit comments

Comments
 (0)