Skip to content

Commit 258caaf

Browse files
cognifloydcognifloyd
authored
Merge branch 'master' into st2client_deps
2 parents 9b3e007 + d4cd09f commit 258caaf

20 files changed

Lines changed: 286 additions & 215 deletions

File tree

‎.github/workflows/checks.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
name: Add CHANGELOG.rst
1515
runs-on: ubuntu-20.04
1616
steps:
17-
- uses: actions/checkout@v1
17+
- uses: actions/checkout@v4
1818
- name: Changelog check
1919
# https://github.com/marketplace/actions/changelog-checker
2020
uses: Zomzog/changelog-checker@v1.2.0

‎.github/workflows/ci.yaml‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ jobs:
5757
- name: 'Lint Checks (black, flake8, etc.)'
5858
task: 'ci-checks'
5959
python-version-short: '3.8'
60-
python-version: '3.8.18'
60+
python-version: '3.8.10'
6161
- name: 'Compile (pip deps, pylint, etc.)'
6262
task: 'ci-compile'
6363
python-version-short: '3.8'
64-
python-version: '3.8.18'
64+
python-version: '3.8.10'
6565
- name: 'Lint Checks (black, flake8, etc.)'
6666
task: 'ci-checks'
6767
python-version-short: '3.9'
@@ -77,16 +77,16 @@ jobs:
7777
PYLINT_CONCURRENCY: '6'
7878
steps:
7979
- name: Checkout repository
80-
uses: actions/checkout@v2
80+
uses: actions/checkout@v4
8181
- name: Custom Environment Setup
8282
run: |
8383
./scripts/github/setup-environment.sh
8484
- name: 'Set up Python (${{ matrix.python-version }})'
85-
uses: actions/setup-python@v2
85+
uses: actions/setup-python@v5
8686
with:
8787
python-version: '${{ matrix.python-version }}'
8888
- name: Cache Python Dependencies
89-
uses: actions/cache@v2
89+
uses: actions/cache@v4
9090
with:
9191
path: |
9292
~/.cache/pip
@@ -95,20 +95,20 @@ jobs:
9595
# TODO: maybe make the virtualenv a partial cache to exclude st2*?
9696
# !virtualenv/lib/python*/site-packages/st2*
9797
# !virtualenv/bin/st2*
98-
key: ${{ runner.os }}-v4-python-${{ matrix.python-version }}-${{ hashFiles('requirements.txt', 'test-requirements.txt') }}
98+
key: ${{ runner.os }}-v5-python-${{ matrix.python-version }}-${{ hashFiles('requirements.txt', 'test-requirements.txt', 'lockfiles/*.lock') }}
9999
# Don't use alternative key as if requirements.txt has altered we
100100
# don't want to retrieve previous cache
101101
#restore-keys: |
102-
# ${{ runner.os }}-v4-python-${{ matrix.python }}-
102+
# ${{ runner.os }}-v5-python-${{ matrix.python }}-
103103
- name: Cache APT Dependencies
104104
id: cache-apt-deps
105-
uses: actions/cache@v2
105+
uses: actions/cache@v4
106106
with:
107107
path: |
108108
~/apt_cache
109-
key: ${{ runner.os }}-apt-v7-${{ hashFiles('scripts/github/apt-packages.txt') }}
109+
key: ${{ runner.os }}-v8-apt-${{ hashFiles('scripts/github/apt-packages.txt') }}
110110
restore-keys: |
111-
${{ runner.os }}-apt-v7-
111+
${{ runner.os }}-v8-apt-
112112
- name: Install APT Depedencies
113113
env:
114114
CACHE_HIT: ${{steps.cache-apt-deps.outputs.cache-hit}}
@@ -176,16 +176,16 @@ jobs:
176176
TESTS_TO_SKIP: "tests.test_quickstart_rules tests.test_run_pack_tests_tool"
177177
steps:
178178
- name: Checkout repository
179-
uses: actions/checkout@v2
179+
uses: actions/checkout@v4
180180
- name: Custom Environment Setup
181181
run: |
182182
./scripts/github/setup-environment.sh
183183
- name: 'Set up Python (${{ matrix.python-version }})'
184-
uses: actions/setup-python@v2
184+
uses: actions/setup-python@v5
185185
with:
186186
python-version: '${{ matrix.python-version }}'
187187
- name: Cache Python Dependencies
188-
uses: actions/cache@v2
188+
uses: actions/cache@v4
189189
with:
190190
path: |
191191
~/.cache/pip
@@ -194,18 +194,18 @@ jobs:
194194
# TODO: maybe make the virtualenv a partial cache to exclude st2*?
195195
# !virtualenv/lib/python*/site-packages/st2*
196196
# !virtualenv/bin/st2*
197-
key: ${{ runner.os }}-v3-python-${{ matrix.python-version }}-${{ hashFiles('requirements.txt', 'test-requirements.txt') }}
197+
key: ${{ runner.os }}-v5-python-${{ matrix.python-version }}-${{ hashFiles('requirements.txt', 'test-requirements.txt', 'lockfiles/*.lock') }}
198198
restore-keys: |
199199
${{ runner.os }}-python-${{ matrix.python }}-
200200
- name: Cache APT Dependencies
201201
id: cache-apt-deps
202-
uses: actions/cache@v2
202+
uses: actions/cache@v4
203203
with:
204204
path: |
205205
~/apt_cache
206-
key: ${{ runner.os }}-apt-v5-${{ hashFiles('scripts/github/apt-packages.txt') }}
206+
key: ${{ runner.os }}-v8-apt-${{ hashFiles('scripts/github/apt-packages.txt') }}
207207
restore-keys: |
208-
${{ runner.os }}-apt-v5-
208+
${{ runner.os }}-v8-apt-
209209
- name: Install APT Depedencies
210210
env:
211211
CACHE_HIT: ${{steps.cache-apt-deps.outputs.cache-hit}}
@@ -286,7 +286,7 @@ jobs:
286286
tar cvzpf logs.tar.gz logs/*
287287
- name: Upload StackStorm services Logs
288288
if: ${{ failure() }}
289-
uses: actions/upload-artifact@v2
289+
uses: actions/upload-artifact@v4
290290
with:
291291
name: logs-py${{ matrix.python-version }}
292292
path: logs.tar.gz
@@ -314,13 +314,13 @@ jobs:
314314
nosetests_node_total: 2
315315
nosetests_node_index: 0
316316
python-version-short: '3.8'
317-
python-version: '3.8.18'
317+
python-version: '3.8.10'
318318
- name: 'Unit Tests (chunk 2)'
319319
task: 'ci-unit'
320320
nosetests_node_total: 2
321321
nosetests_node_index: 1
322322
python-version-short: '3.8'
323-
python-version: '3.8.18'
323+
python-version: '3.8.10'
324324
- name: 'Unit Tests (chunk 1)'
325325
task: 'ci-unit'
326326
nosetests_node_total: 2
@@ -380,16 +380,16 @@ jobs:
380380
PATH: /home/runner/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
381381
steps:
382382
- name: Checkout repository
383-
uses: actions/checkout@v2
383+
uses: actions/checkout@v4
384384
- name: Custom Environment Setup
385385
run: |
386386
./scripts/github/setup-environment.sh
387387
- name: 'Set up Python (${{ matrix.python-version }})'
388-
uses: actions/setup-python@v2
388+
uses: actions/setup-python@v5
389389
with:
390390
python-version: '${{ matrix.python-version }}'
391391
- name: Cache Python Dependencies
392-
uses: actions/cache@v2
392+
uses: actions/cache@v4
393393
with:
394394
path: |
395395
~/.cache/pip
@@ -398,20 +398,20 @@ jobs:
398398
# TODO: maybe make the virtualenv a partial cache to exclude st2*?
399399
# !virtualenv/lib/python*/site-packages/st2*
400400
# !virtualenv/bin/st2*
401-
key: ${{ runner.os }}-v4-python-${{ matrix.python-version }}-${{ hashFiles('requirements.txt', 'test-requirements.txt') }}
401+
key: ${{ runner.os }}-v5-python-${{ matrix.python-version }}-${{ hashFiles('requirements.txt', 'test-requirements.txt', 'lockfiles/*.lock') }}
402402
# Don't use alternative key as if requirements.txt has altered we
403403
# don't want to retrieve previous cache
404404
#restore-keys: |
405-
# ${{ runner.os }}-v4-python-${{ matrix.python }}-
405+
# ${{ runner.os }}-v5-python-${{ matrix.python }}-
406406
- name: Cache APT Dependencies
407407
id: cache-apt-deps
408-
uses: actions/cache@v2
408+
uses: actions/cache@v4
409409
with:
410410
path: |
411411
~/apt_cache
412-
key: ${{ runner.os }}-apt-v5-${{ hashFiles('scripts/github/apt-packages.txt') }}
412+
key: ${{ runner.os }}-v8-apt-${{ hashFiles('scripts/github/apt-packages.txt') }}
413413
restore-keys: |
414-
${{ runner.os }}-apt-v5-
414+
${{ runner.os }}-v8-apt-
415415
- name: Install APT Depedencies
416416
env:
417417
CACHE_HIT: ${{steps.cache-apt-deps.outputs.cache-hit}}
@@ -489,19 +489,19 @@ jobs:
489489
nosetests_node_total: 1
490490
nosetests_node_index: 0
491491
python-version-short: '3.8'
492-
python-version: '3.8.18'
492+
python-version: '3.8.10'
493493
- name: 'Integration Tests (chunk 1)'
494494
task: 'ci-integration'
495495
nosetests_node_total: 2
496496
nosetests_node_index: 0
497497
python-version-short: '3.8'
498-
python-version: '3.8.18'
498+
python-version: '3.8.10'
499499
- name: 'Integration Tests (chunk 2)'
500500
task: 'ci-integration'
501501
nosetests_node_total: 2
502502
nosetests_node_index: 1
503503
python-version-short: '3.8'
504-
python-version: '3.8.18'
504+
python-version: '3.8.10'
505505
- name: 'Pack Tests'
506506
task: 'ci-packs-tests'
507507
nosetests_node_total: 1
@@ -600,16 +600,16 @@ jobs:
600600

601601
steps:
602602
- name: Checkout repository
603-
uses: actions/checkout@v2
603+
uses: actions/checkout@v4
604604
- name: Custom Environment Setup
605605
run: |
606606
./scripts/github/setup-environment.sh
607607
- name: 'Set up Python (${{ matrix.python-version }})'
608-
uses: actions/setup-python@v2
608+
uses: actions/setup-python@v5
609609
with:
610610
python-version: '${{ matrix.python-version }}'
611611
- name: Cache Python Dependencies
612-
uses: actions/cache@v2
612+
uses: actions/cache@v4
613613
with:
614614
path: |
615615
~/.cache/pip
@@ -618,20 +618,20 @@ jobs:
618618
# TODO: maybe make the virtualenv a partial cache to exclude st2*?
619619
# !virtualenv/lib/python*/site-packages/st2*
620620
# !virtualenv/bin/st2*
621-
key: ${{ runner.os }}-v4-python-${{ matrix.python-version }}-${{ hashFiles('requirements.txt', 'test-requirements.txt') }}
621+
key: ${{ runner.os }}-v5-python-${{ matrix.python-version }}-${{ hashFiles('requirements.txt', 'test-requirements.txt', 'lockfiles/*.lock') }}
622622
# Don't use alternative key as if requirements.txt has altered we
623623
# don't want to retrieve previous cache
624624
#restore-keys: |
625-
# ${{ runner.os }}-v4-python-${{ matrix.python }}-
625+
# ${{ runner.os }}-v5-python-${{ matrix.python }}-
626626
- name: Cache APT Dependencies
627627
id: cache-apt-deps
628-
uses: actions/cache@v2
628+
uses: actions/cache@v4
629629
with:
630630
path: |
631631
~/apt_cache
632-
key: ${{ runner.os }}-apt-v5-${{ hashFiles('scripts/github/apt-packages.txt') }}
632+
key: ${{ runner.os }}-v8-apt-${{ hashFiles('scripts/github/apt-packages.txt') }}
633633
restore-keys: |
634-
${{ runner.os }}-apt-v5-
634+
${{ runner.os }}-v8-apt-
635635
- name: Install APT Depedencies
636636
env:
637637
CACHE_HIT: ${{steps.cache-apt-deps.outputs.cache-hit}}
@@ -695,7 +695,7 @@ jobs:
695695
tar cvzpf logs.tar.gz logs/*
696696
- name: Upload StackStorm services Logs
697697
if: ${{ failure() && env.TASK == 'ci-integration' }}
698-
uses: actions/upload-artifact@v2
698+
uses: actions/upload-artifact@v4
699699
with:
700700
name: logs-py${{ matrix.python-version }}-nose-${{ matrix.nosetests_node_index }}
701701
path: logs.tar.gz

‎.github/workflows/lint.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,20 @@ jobs:
3333

3434
steps:
3535
- name: Checkout repository
36-
uses: actions/checkout@v2
36+
uses: actions/checkout@v4
3737
with:
3838
# a test uses a submodule, and pants needs access to it to calculate deps.
3939
submodules: 'true'
4040

4141
#- name: Cache APT Dependencies
4242
# id: cache-apt-deps
43-
# uses: actions/cache@v2
43+
# uses: actions/cache@v4
4444
# with:
4545
# path: |
4646
# ~/apt_cache
47-
# key: ${{ runner.os }}-apt-v7-${{ hashFiles('scripts/github/apt-packages.txt') }}
47+
# key: ${{ runner.os }}-v8-apt-${{ hashFiles('scripts/github/apt-packages.txt') }}
4848
# restore-keys: |
49-
# ${{ runner.os }}-apt-v7-
49+
# ${{ runner.os }}-v8-apt-
5050
- name: Install APT Depedencies
5151
env:
5252
CACHE_HIT: 'false' # cache doesn't work
@@ -57,7 +57,7 @@ jobs:
5757
./scripts/github/install-apt-packages-use-cache.sh
5858
5959
- name: Initialize Pants and its GHA caches
60-
uses: pantsbuild/actions/init-pants@v6-scie-pants
60+
uses: pantsbuild/actions/init-pants@v8
6161
# This action adds an env var to make pants use both pants.ci.toml & pants.toml.
6262
# This action also creates 3 GHA caches (1 is optional).
6363
# - `pants-setup` has the bootsrapped pants install
@@ -83,7 +83,7 @@ jobs:
8383
pants lint ::
8484
8585
- name: Upload pants log
86-
uses: actions/upload-artifact@v2
86+
uses: actions/upload-artifact@v4
8787
with:
8888
name: pants-log-py${{ matrix.python-version }}
8989
path: .pants.d/pants.log

‎.github/workflows/microbenchmarks.yaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
nosetests_node_total: 1
4040
nosetests_node_index: 0
4141
python-version-short: '3.8'
42-
python-version: '3.8.18'
42+
python-version: '3.8.10'
4343
- name: 'Microbenchmarks'
4444
task: 'micro-benchmarks'
4545
nosetests_node_total: 1
@@ -74,32 +74,32 @@ jobs:
7474
PATH: /home/runner/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
7575
steps:
7676
- name: Checkout repository
77-
uses: actions/checkout@v2
77+
uses: actions/checkout@v4
7878
- name: 'Set up Python (${{ matrix.python-version }})'
79-
uses: actions/setup-python@v2
79+
uses: actions/setup-python@v5
8080
with:
8181
python-version: '${{ matrix.python-version }}'
8282
- name: Cache Python Dependencies
83-
uses: actions/cache@v2
83+
uses: actions/cache@v4
8484
with:
8585
path: |
8686
~/.cache/pip
8787
virtualenv
8888
~/virtualenv
89-
key: ${{ runner.os }}-v4-python-${{ matrix.python-version }}-${{ hashFiles('requirements.txt', 'test-requirements.txt') }}
89+
key: ${{ runner.os }}-v5-python-${{ matrix.python-version }}-${{ hashFiles('requirements.txt', 'test-requirements.txt', 'lockfiles/*.lock') }}
9090
# Don't use alternative key as if requirements.txt has altered we
9191
# don't want to retrieve previous cache
9292
#restore-keys: |
93-
# ${{ runner.os }}-v4-python-${{ matrix.python }}-
93+
# ${{ runner.os }}-v5-python-${{ matrix.python }}-
9494
- name: Cache APT Dependencies
9595
id: cache-apt-deps
96-
uses: actions/cache@v2
96+
uses: actions/cache@v4
9797
with:
9898
path: |
9999
~/apt_cache
100-
key: ${{ runner.os }}-apt-v7-${{ hashFiles('scripts/github/apt-packages.txt') }}
100+
key: ${{ runner.os }}-v8-apt-${{ hashFiles('scripts/github/apt-packages.txt') }}
101101
restore-keys: |
102-
${{ runner.os }}-apt-v7-
102+
${{ runner.os }}-v8-apt-
103103
- name: Install APT Dependencies
104104
env:
105105
CACHE_HIT: ${{steps.cache-apt-deps.outputs.cache-hit}}
@@ -120,7 +120,7 @@ jobs:
120120
run: |
121121
script -e -c "make ${TASK}" && exit 0
122122
- name: Upload Histograms
123-
uses: actions/upload-artifact@v2
123+
uses: actions/upload-artifact@v4
124124
with:
125125
name: benchmark_histograms
126126
path: benchmark_histograms/

0 commit comments

Comments
 (0)