Skip to content

Commit af936f2

Browse files
cognifloydcognifloyd
authored
Merge branch 'master' into pack-config-more-jsonschema
2 parents 6ed8e5d + a56a9e6 commit af936f2

235 files changed

Lines changed: 7436 additions & 867 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.circleci/config.yml‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,7 @@ jobs:
127127
- setup_remote_docker:
128128
reusable: true # default - false
129129
exclusive: true # default - true
130-
# Temporary workaround for Circle CI issue
131-
# https://discuss.circleci.com/t/setup-remote-docker-connection-failures/26434
132-
version: 18.05.0-ce
130+
version: 19.03.14
133131
- run:
134132
name: Docker version
135133
command: |
@@ -176,7 +174,7 @@ jobs:
176174
docker cp . st2-packages-vol:${ST2_GITDIR}
177175
- run:
178176
name: Pull dependent Docker Images
179-
command: .circle/docker-compose2.sh pull ${DISTRO}
177+
command: .circle/docker-compose2.sh pull ${DISTRO} || .circle/docker-compose2.sh pull ${DISTRO}
180178
working_directory: ~/st2-packages
181179
- run:
182180
name: Build the ${DISTRO} Packages
@@ -186,14 +184,6 @@ jobs:
186184
mkdir -p ~/st2/packages/${DISTRO}/log/
187185
docker cp st2-packages-vol:/root/build/. ~/st2/packages/${DISTRO}
188186
working_directory: ~/st2-packages
189-
# # TODO: It works! (~0.5-1min speed-up) Enable CircleCI2.0 cache for pip and wheelhouse later
190-
# - run:
191-
# name: Build the ${DISTRO} Packages 2nd time (compare with pip/wheelhouse cached)
192-
# command: |
193-
# .circle/docker-compose2.sh build ${DISTRO}
194-
# # Once build container finishes we can copy packages directly from it
195-
# docker cp st2-packages-vol:/root/build /tmp/st2-packages
196-
# working_directory: ~/st2-packages
197187
- run:
198188
name: Test the Packages
199189
command: .circle/docker-compose2.sh test ${DISTRO}

‎.github/workflows/checks.yaml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Checks
2+
3+
on:
4+
pull_request:
5+
types: [assigned, opened, synchronize, reopened, labeled, unlabeled]
6+
branches:
7+
- master
8+
- v[0-9]+.[0-9]+
9+
10+
jobs:
11+
# Changelog checker will verify if CHANGELOG.rst was updated for every PR
12+
# See: https://keepachangelog.com/en/1.0.0/
13+
changelog-checker:
14+
name: Add CHANGELOG.rst
15+
runs-on: ubuntu-latest
16+
steps:
17+
- uses: actions/checkout@v1
18+
- name: Changelog check
19+
# https://github.com/marketplace/actions/changelog-checker
20+
uses: Zomzog/changelog-checker@v1.2.0
21+
with:
22+
fileName: CHANGELOG.rst
23+
checkNotification: Simple
24+
env:
25+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/ci.yaml‎

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ on:
2121
- cron: '0 0 * * *'
2222

2323
jobs:
24+
# TODO: Fix the required checks!
25+
# When the pre_job triggers and skips builds, it prevents merging the PR because
26+
# the required checks are reported as skipped instead of passed.
2427
# Special job which automatically cancels old runs for the same branch, prevents runs for the
2528
# same file set which has already passed, etc.
2629
pre_job:
@@ -40,7 +43,7 @@ jobs:
4043
needs: pre_job
4144
# NOTE: We always want to run job on master since we run some additional checks there (code
4245
# coverage, etc)
43-
if: ${{ needs.pre_job.outputs.should_skip != 'true' || github.ref == 'refs/heads/master' }}
46+
# if: ${{ needs.pre_job.outputs.should_skip != 'true' || github.ref == 'refs/heads/master' }}
4447
name: '${{ matrix.name }} - Python ${{ matrix.python-version-short }}'
4548
runs-on: ubuntu-latest
4649
strategy:
@@ -92,9 +95,11 @@ jobs:
9295
# TODO: maybe make the virtualenv a partial cache to exclude st2*?
9396
# !virtualenv/lib/python*/site-packages/st2*
9497
# !virtualenv/bin/st2*
95-
key: ${{ runner.os }}-v2-python-${{ matrix.python-version }}-${{ hashFiles('requirements.txt', 'test-requirements.txt') }}
96-
restore-keys: |
97-
${{ runner.os }}-v2-python-${{ matrix.python }}-
98+
key: ${{ runner.os }}-v4-python-${{ matrix.python-version }}-${{ hashFiles('requirements.txt', 'test-requirements.txt') }}
99+
# Don't use alternative key as if requirements.txt has altered we
100+
# don't want to retrieve previous cache
101+
#restore-keys: |
102+
# ${{ runner.os }}-v4-python-${{ matrix.python }}-
98103
- name: Cache APT Dependencies
99104
id: cache-apt-deps
100105
uses: actions/cache@v2
@@ -135,7 +140,8 @@ jobs:
135140
needs: pre_job
136141
# NOTE: We always want to run job on master since we run some additional checks there (code
137142
# coverage, etc)
138-
if: ${{ needs.pre_job.outputs.should_skip != 'true' || github.ref == 'refs/heads/master' }}
143+
# NB: disabled. See TODO above pre_job
144+
# if: ${{ needs.pre_job.outputs.should_skip != 'true' || github.ref == 'refs/heads/master' }}
139145
name: '${{ matrix.name }} - Python ${{ matrix.python-version-short }}'
140146
runs-on: ubuntu-latest
141147
strategy:
@@ -233,9 +239,11 @@ jobs:
233239
# TODO: maybe make the virtualenv a partial cache to exclude st2*?
234240
# !virtualenv/lib/python*/site-packages/st2*
235241
# !virtualenv/bin/st2*
236-
key: ${{ runner.os }}-python-${{ matrix.python-version }}-${{ hashFiles('requirements.txt', 'test-requirements.txt') }}
237-
restore-keys: |
238-
${{ runner.os }}-python-${{ matrix.python }}-
242+
key: ${{ runner.os }}-v4-python-${{ matrix.python-version }}-${{ hashFiles('requirements.txt', 'test-requirements.txt') }}
243+
# Don't use alternative key as if requirements.txt has altered we
244+
# don't want to retrieve previous cache
245+
#restore-keys: |
246+
# ${{ runner.os }}-v4-python-${{ matrix.python }}-
239247
- name: Cache APT Dependencies
240248
id: cache-apt-deps
241249
uses: actions/cache@v2
@@ -304,7 +312,7 @@ jobs:
304312
needs: pre_job
305313
# NOTE: We always want to run job on master since we run some additional checks there (code
306314
# coverage, etc)
307-
if: ${{ needs.pre_job.outputs.should_skip != 'true' || github.ref == 'refs/heads/master' }}
315+
# if: ${{ needs.pre_job.outputs.should_skip != 'true' || github.ref == 'refs/heads/master' }}
308316
name: '${{ matrix.name }} - Python ${{ matrix.python-version-short }}'
309317
runs-on: ubuntu-latest
310318
strategy:
@@ -428,6 +436,7 @@ jobs:
428436

429437
# GitHub is juggling how to set vars for multiple shells. Protect our PATH assumptions.
430438
PATH: /home/runner/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
439+
431440
steps:
432441
- name: Checkout repository
433442
uses: actions/checkout@v2
@@ -448,9 +457,11 @@ jobs:
448457
# TODO: maybe make the virtualenv a partial cache to exclude st2*?
449458
# !virtualenv/lib/python*/site-packages/st2*
450459
# !virtualenv/bin/st2*
451-
key: ${{ runner.os }}-python-${{ matrix.python-version }}-${{ hashFiles('requirements.txt', 'test-requirements.txt') }}
452-
restore-keys: |
453-
${{ runner.os }}-python-${{ matrix.python }}-
460+
key: ${{ runner.os }}-v4-python-${{ matrix.python-version }}-${{ hashFiles('requirements.txt', 'test-requirements.txt') }}
461+
# Don't use alternative key as if requirements.txt has altered we
462+
# don't want to retrieve previous cache
463+
#restore-keys: |
464+
# ${{ runner.os }}-v4-python-${{ matrix.python }}-
454465
- name: Cache APT Dependencies
455466
id: cache-apt-deps
456467
uses: actions/cache@v2

‎.github/workflows/microbenchmarks.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@ jobs:
8686
~/.cache/pip
8787
virtualenv
8888
~/virtualenv
89-
key: ${{ runner.os }}-python-${{ matrix.python-version }}-${{ hashFiles('requirements.txt', 'test-requirements.txt') }}
89+
key: ${{ runner.os }}-v4-python-${{ matrix.python-version }}-${{ hashFiles('requirements.txt', 'test-requirements.txt') }}
9090
restore-keys: |
91-
${{ runner.os }}-python-${{ matrix.python }}-
91+
${{ runner.os }}-v4-python-${{ matrix.python }}-
9292
- name: Cache APT Dependencies
9393
id: cache-apt-deps
9494
uses: actions/cache@v2

‎.github/workflows/orquesta-integration-tests.yaml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ on:
2525
- cron: '0 0 * * *'
2626

2727
jobs:
28+
# TODO: Fix the required checks!
29+
# When the pre_job triggers and skips builds, it prevents merging the PR because
30+
# the required checks are reported as skipped instead of passed.
2831
# Special job which automatically cancels old runs for the same branch, prevents runs for the
2932
# same file set which has already passed, etc.
3033
pre_job:
@@ -43,7 +46,7 @@ jobs:
4346
needs: pre_job
4447
# NOTE: We always want to run job on master since we run some additional checks there (code
4548
# coverage, etc)
46-
if: ${{ needs.pre_job.outputs.should_skip != 'true' || github.ref == 'refs/heads/master' }}
49+
# if: ${{ needs.pre_job.outputs.should_skip != 'true' || github.ref == 'refs/heads/master' }}
4750
name: '${{ matrix.name }} - Python ${{ matrix.python-version-short }}'
4851
runs-on: ubuntu-latest
4952
strategy:
@@ -139,9 +142,9 @@ jobs:
139142
# TODO: maybe make the virtualenv a partial cache to exclude st2*?
140143
# !virtualenv/lib/python*/site-packages/st2*
141144
# !virtualenv/bin/st2*
142-
key: ${{ runner.os }}-python-${{ matrix.python-version }}-${{ hashFiles('requirements.txt', 'test-requirements.txt') }}
145+
key: ${{ runner.os }}-v4-python-${{ matrix.python-version }}-${{ hashFiles('requirements.txt', 'test-requirements.txt') }}
143146
restore-keys: |
144-
${{ runner.os }}-python-${{ matrix.python }}-
147+
${{ runner.os }}-v4-python-${{ matrix.python }}-
145148
- name: Cache APT Dependencies
146149
id: cache-apt-deps
147150
uses: actions/cache@v2

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
*.py[cod]
22
*.sqlite
3-
*.swp
43
*.log
54
.stamp*
65

@@ -62,3 +61,5 @@ benchmark_histograms/
6261
# Editor Saves
6362
*~
6463
\#*\#
64+
[._]*.sw[a-p]
65+
[._]sw[a-p]

0 commit comments

Comments
 (0)