Skip to content

Commit 648fcf1

Browse files
MEPalmaMEPalma
committed
Merge branch 'master' into MEP-CFN-fn_sub
2 parents 2bfc135 + 20c40d1 commit 648fcf1

38 files changed

+962
-170
lines changed

‎.circleci/config.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,15 +164,16 @@ jobs:
164164
steps:
165165
- checkout
166166
- restore_cache:
167-
key: python-requirements-{{ checksum "requirements-dev.txt" }}
167+
key: python-requirements-{{ checksum "requirements-typehint.txt" }}
168168
- run:
169169
name: Setup environment
170170
command: |
171+
make install-dev-types
171172
make install
172173
mkdir -p target/reports
173174
mkdir -p target/coverage
174175
- save_cache:
175-
key: python-requirements-{{ checksum "requirements-dev.txt" }}
176+
key: python-requirements-{{ checksum "requirements-typehint.txt" }}
176177
paths:
177178
- "~/.cache/pip"
178179
- persist_to_workspace:

‎.github/actions/load-localstack-docker-from-artifacts/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ runs:
1818
with:
1919
python-version-file: '.python-version'
2020
cache: 'pip'
21-
cache-dependency-path: 'requirements-dev.txt'
21+
cache-dependency-path: 'requirements-typehint.txt'
2222

2323
- name: Install docker helper dependencies
2424
shell: bash

‎.github/actions/setup-tests-env/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ runs:
88
with:
99
python-version-file: '.python-version'
1010
cache: 'pip'
11-
cache-dependency-path: 'requirements-dev.txt'
11+
cache-dependency-path: 'requirements-typehint.txt'
1212

1313
- name: Install Community Dependencies
1414
shell: bash
15-
run: make install-dev
15+
run: make install-dev-types
1616

1717
- name: Setup environment
1818
shell: bash

‎.github/workflows/aws-main.yml

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,21 @@ on:
1414
- '!.gitignore'
1515
- '!.git-blame-ignore-revs'
1616
- '!.github/**'
17+
- '!docs/**'
1718
branches:
1819
- master
20+
pull_request:
21+
paths:
22+
- '**'
23+
- '.github/actions/**'
24+
- '.github/workflows/aws-main.yml'
25+
- '.github/workflows/aws-tests.yml'
26+
- '!CODEOWNERS'
27+
- '!README.md'
28+
- '!.gitignore'
29+
- '!.git-blame-ignore-revs'
30+
- '!.github/**'
31+
- '!docs/**'
1932
workflow_dispatch:
2033
inputs:
2134
onlyAcceptanceTests:
@@ -172,7 +185,7 @@ jobs:
172185
# push image on master, target branch not set, and the dependent steps were either successful or skipped
173186
# TO-DO: enable job after workflow in CircleCI is disabled
174187
if: false
175-
# if: github.ref == 'refs/heads/master' && !failure() && !cancelled()
188+
# if: github.ref == 'refs/heads/master' && !failure() && !cancelled() && github.repository == 'localstack/localstack'
176189
needs:
177190
# all tests need to be successful for the image to be pushed
178191
- test
@@ -184,7 +197,7 @@ jobs:
184197
fetch-depth: 0
185198

186199
- name: Load Localstack ${{ env.PLATFORM_NAME_AMD64 }} Docker Image
187-
uses: localstack/localstack/.github/actions/load-localstack-docker-from-artifacts@master
200+
uses: ./.github/actions/load-localstack-docker-from-artifacts
188201
with:
189202
platform: ${{ env.PLATFORM_NAME_AMD64 }}
190203

@@ -213,7 +226,7 @@ jobs:
213226
TARGET_IMAGE_NAME="public.ecr.aws/localstack/localstack" ./bin/docker-helper.sh push
214227
215228
- name: Load Localstack ${{ env.PLATFORM_NAME_ARM64 }} Docker Image
216-
uses: localstack/localstack/.github/actions/load-localstack-docker-from-artifacts@master
229+
uses: ./.github/actions/load-localstack-docker-from-artifacts
217230
with:
218231
platform: ${{ env.PLATFORM_NAME_ARM64 }}
219232

@@ -252,7 +265,7 @@ jobs:
252265
253266
push-to-tinybird:
254267
name: Push Workflow Status to Tinybird
255-
if: always() && github.ref == 'refs/heads/master'
268+
if: always() && github.ref == 'refs/heads/master' && github.repository == 'localstack/localstack'
256269
runs-on: ubuntu-latest
257270
needs:
258271
- test
@@ -261,7 +274,7 @@ jobs:
261274
uses: localstack/tinybird-workflow-push@v3
262275
with:
263276
# differentiate between "acceptance only" and "proper / full" runs
264-
workflow_id: ${{ inputs.onlyAcceptanceTests && 'tests_acceptance' || 'tests_full' }}
277+
workflow_id: ${{ (inputs.onlyAcceptanceTests == true || github.event_name == 'push') && 'tests_acceptance' || 'tests_full' }}
265278
tinybird_token: ${{ secrets.TINYBIRD_CI_TOKEN }}
266279
github_token: ${{ secrets.GITHUB_TOKEN }}
267280
tinybird_datasource: "ci_workflows"

‎.github/workflows/aws-tests-mamr.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
paths:
88
- '.github/workflows/aws-mamr.yml'
99
- '.github/workflows/aws-tests.yml'
10+
- '.github/actions/**'
1011
workflow_dispatch:
1112
inputs:
1213
disableCaching:
@@ -66,7 +67,7 @@ jobs:
6667

6768
push-to-tinybird:
6869
name: Push Workflow Status to Tinybird
69-
if: always() && github.ref == 'refs/heads/master'
70+
if: always() && github.ref == 'refs/heads/master' && github.repository == 'localstack/localstack'
7071
runs-on: ubuntu-latest
7172
needs:
7273
- test-ma-mr

0 commit comments

Comments
 (0)