Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into jszwedko/bump-dd-ru…
Browse files Browse the repository at this point in the history
…st-license-tool-1.0.2
  • Loading branch information
jszwedko committed Oct 3, 2023
2 parents 2415015 + 23745f2 commit 2f605c3
Show file tree
Hide file tree
Showing 94 changed files with 1,882 additions and 328 deletions.
7 changes: 5 additions & 2 deletions .github/actions/spelling/excludes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
(?:^|/)(?i)COPYRIGHT
(?:^|/)(?i)LICEN[CS]E
(?:^|/)3rdparty/
(?:^|/)amplify\.yml$
(?:^|/)go\.sum$
(?:^|/)package(?:-lock|)\.json$
(?:^|/)Pipfile$
(?:^|/)pyproject.toml
(?:^|/)requirements(?:-dev|-doc|-test|)\.txt$
(?:^|/)vendor/
(?:^|/)amplify\.yml$
\.a$
\.ai$
\.all-contributorsrc$
Expand Down Expand Up @@ -70,13 +70,17 @@
\.zst$
^\.github/actions/spelling/
^\Q.cargo/config.toml\E$
^\Q.github/dependabot.yml\E$
^\Q.github/workflows/gardener_issue_comment.yml\E$
^\Q.github/workflows/spelling.yml\E$
^\Qbenches/codecs/moby_dick.txt\E$
^\Qbenches/dnstap/mod.rs\E$
^\Qbenches/transform/route.rs\E$
^\Qlib/codecs/tests/data/decoding/protobuf/test_protobuf.desc\E$
^\Qlib/codecs/tests/data/decoding/protobuf/test_protobuf3.desc\E$
^\Qlib/codecs/tests/data/protobuf/test.desc\E$
^\Qlib/codecs/tests/data/protobuf/test_protobuf.desc\E$
^\Qlib/codecs/tests/data/protobuf/test_protobuf3.desc\E$
^\Qlib/dnsmsg-parser/benches/benches.rs\E$
^\Qlib/dnsmsg-parser/src/dns_message_parser.rs\E$
^\Qlib/lookup/tests/fixtures/lookup/quoted\E$
Expand Down Expand Up @@ -104,4 +108,3 @@
^\Qwebsite/layouts/shortcodes/config/unit-tests.html\E$
^lib/codecs/tests/data/native_encoding/
ignore$

5 changes: 4 additions & 1 deletion .github/actions/spelling/expect.txt
Original file line number Diff line number Diff line change
Expand Up @@ -840,6 +840,7 @@ posttrunc
prebuild
precpu
preds
prefs
preinst
preread
prereqs
Expand Down Expand Up @@ -1074,6 +1075,7 @@ Takeaways
targetgroup
tarpit
tcmalloc
teconsent
telecom
templatable
templateable
Expand Down Expand Up @@ -1133,6 +1135,8 @@ tripwires
Trivago
trivy
Troutwine
trustarc
truste
TRUSTSTORE
TSDB
Tsvg
Expand Down Expand Up @@ -1224,7 +1228,6 @@ wktpointer
wmem
woooooow
woothee
wor
wordlist
workdir
workstreams
Expand Down
18 changes: 18 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,21 @@ updates:
prefix: "chore(deps)"
open-pull-requests-limit: 100
groups:
amq:
patterns:
- "amq-*"
aws:
patterns:
- "aws-*"
azure:
patterns:
- "azure_*"
clap:
patterns:
- "clap*"
phf:
patterns:
- "phf*"
prost:
patterns:
- "prost"
Expand All @@ -22,6 +34,12 @@ updates:
patterns:
- "tonic"
- "tonic-*"
wasm-bindgen:
patterns:
- "wasm-bindgen-*"
zstd:
patterns:
- "zstd*"
- package-ecosystem: "docker"
directory: "/distribution/docker/"
schedule:
Expand Down
13 changes: 10 additions & 3 deletions .github/workflows/regression.yml
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ jobs:

- name: Login to Amazon ECR
id: login-ecr
uses: aws-actions/amazon-ecr-login@v1
uses: aws-actions/amazon-ecr-login@v2

- name: Docker Login to ECR
uses: docker/login-action@v3
Expand Down Expand Up @@ -440,7 +440,7 @@ jobs:

- name: Login to Amazon ECR
id: login-ecr
uses: aws-actions/amazon-ecr-login@v1
uses: aws-actions/amazon-ecr-login@v2

- name: Docker Login to ECR
uses: docker/login-action@v3
Expand Down Expand Up @@ -486,7 +486,7 @@ jobs:

- name: Login to Amazon ECR
id: login-ecr
uses: aws-actions/amazon-ecr-login@v1
uses: aws-actions/amazon-ecr-login@v2

- name: Download SMP binary
run: |
Expand Down Expand Up @@ -816,6 +816,13 @@ jobs:
context: Regression Detection Suite
status: 'success'

- name: (PR) Indicate why skipped
if: github.event_name == 'pull_request'
run: |
echo "### Workflow skipped" >> $GITHUB_STEP_SUMMARY
echo "This workflow doesn't run on PR's automatically." >> $GITHUB_STEP_SUMMARY
echo "To trigger a run, leave a comment with \`/ci-run-regression\`" >> $GITHUB_STEP_SUMMARY
- name: exit
run: |
echo "failed=${{ env.FAILED }}"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/workload_checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ jobs:

- name: Login to Amazon ECR
id: login-ecr
uses: aws-actions/amazon-ecr-login@v1
uses: aws-actions/amazon-ecr-login@v2

- name: Download SMP binary
run: |
Expand Down
Loading

0 comments on commit 2f605c3

Please sign in to comment.