Skip to content

Commit 100447f

Browse files
committed
Merge branch 'main' into dependabot/npm_and_yarn/micromatch-4.0.8
# Conflicts: # .yarn/install-state.gz # yarn.lock
2 parents ee3f80f + 99c0913 commit 100447f

File tree

910 files changed

+29326
-3168
lines changed

Some content is hidden

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

910 files changed

+29326
-3168
lines changed

.git-blame-ignore-revs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,6 @@ a8ec45c8ea4ba559247b654d01b0d35b21a68865
33
430a1a0a5dd4efe78e21526c37bec9dbce036401
44
d0129c1095216d5c830900c8a6223ef5d4274de1
55
4bc5c823b8ebf5a00491c7e63e1ea49d29bf5ee7
6+
352051999507bd78542e177d67ce1548a0752691
7+
bbe9f971763ca1b27687a6a51067a385a0d23b04
8+
de95c481329aa8b821e6e71ac35c1b8bc67e3e86

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 0 additions & 28 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# https://help.github.com/en/github/building-a-strong-community/configuring-issue-templates-for-your-repository#configuring-the-template-chooser
2+
blank_issues_enabled: true
3+
contact_links:
4+
- name: commercetools Support
5+
url: https://support.commercetools.com
6+
about: Have an issue or question? Ask our support team!

.github/ISSUE_TEMPLATE/custom.md

Lines changed: 0 additions & 10 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 0 additions & 20 deletions
This file was deleted.

.github/workflows/benchmark.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
name: Benchmark
55

66
# Declare default permissions as read only.
7-
permissions: read-all
7+
permissions: { }
88

99
jobs:
1010
benchmark:
@@ -16,7 +16,7 @@ jobs:
1616
- name: Checkout
1717
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
1818

19-
- uses: gradle/wrapper-validation-action@216d1ad2b3710bf005dc39237337b9673fd8fcd5 # v3.3.2
19+
- uses: gradle/wrapper-validation-action@f9c9c575b8b21b6485636a91ffecd10e558c62f6 # v3.5.0
2020

2121
- name: Setup Java
2222
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4

.github/workflows/ci.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
name: CI
1010

1111
# Declare default permissions as read only.
12-
permissions: read-all
12+
permissions: {}
1313

1414
concurrency:
1515
group: ${{ github.workflow }}-${{ github.ref }}
@@ -44,7 +44,7 @@ jobs:
4444
# https://help.github.com/en/actions/reference/events-that-trigger-workflows#triggering-new-workflows-using-a-personal-access-token
4545
# https://github.community/t/action-does-not-trigger-another-on-push-tag-action/17148/8
4646
token: ${{ steps.generate_github_token.outputs.token }}
47-
- uses: gradle/wrapper-validation-action@216d1ad2b3710bf005dc39237337b9673fd8fcd5 # v3.3.2
47+
- uses: gradle/wrapper-validation-action@f9c9c575b8b21b6485636a91ffecd10e558c62f6 # v3.5.0
4848

4949
- name: Setup Java
5050
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4
@@ -71,7 +71,9 @@ jobs:
7171

7272
- name: "Run if style changes have been detected"
7373
if: steps.commit_style_fix.outputs.changes_detected == 'true'
74-
run: echo "${{steps.commit_style_fix.outputs.commit_hash}}" >> .git-blame-ignore-revs
74+
run: echo "$HASH" >> .git-blame-ignore-revs
75+
env:
76+
HASH: ${{steps.commit_style_fix.outputs.commit_hash}}
7577

7678
- uses: stefanzweifel/git-auto-commit-action@8621497c8c39c72f3e2a999a26b4ca1b5058a842 # v5.0.1
7779
id: commit_rev_ignore
@@ -109,6 +111,7 @@ jobs:
109111
run: git push origin
110112

111113
- name: Run integration tests for PR
114+
# ignore renovate branches as they are retriggered with every new commit to main branch
112115
if: (github.event_name == 'pull_request' && !startsWith(github.head_ref, 'renovate/')) || github.event_name == 'merge_group'
113116
run: ./gradlew clean build publishMavenPublicationToMavenLocal runMainMethodThreadLeakTest runMainMethodMemoryLeakTest writeVersionToExamples
114117
env:
@@ -137,7 +140,7 @@ jobs:
137140
run: ./gradlew codeCoverageReport
138141

139142
- name: Send code coverage report to Codecov.io
140-
uses: codecov/codecov-action@125fc84a9a348dbcf27191600683ec096ec9021c # v4.4.1
143+
uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4.6.0
141144
with:
142145
token: ${{ secrets.CODECOV_TOKEN }}
143146
docs:
@@ -159,7 +162,7 @@ jobs:
159162
with:
160163
token: ${{ steps.generate_github_token.outputs.token }}
161164

162-
- uses: gradle/wrapper-validation-action@216d1ad2b3710bf005dc39237337b9673fd8fcd5 # v3.3.2
165+
- uses: gradle/wrapper-validation-action@f9c9c575b8b21b6485636a91ffecd10e558c62f6 # v3.5.0
163166

164167
- name: Setup Java
165168
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4
@@ -187,6 +190,6 @@ jobs:
187190
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
188191
- name: Generate and submit dependency graph
189192
if: github.event_name == 'workflow_dispatch' || github.event_name == 'push' && github.ref == 'refs/heads/main'
190-
uses: gradle/actions/dependency-submission@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2
193+
uses: gradle/actions/dependency-submission@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3.5.0
191194
with:
192195
github-token: ${{ steps.generate_github_token.outputs.token }}

.github/workflows/codeql.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ jobs:
5050
- name: Checkout repository
5151
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
5252

53-
- uses: gradle/wrapper-validation-action@216d1ad2b3710bf005dc39237337b9673fd8fcd5 # v3.3.2
53+
- uses: gradle/wrapper-validation-action@f9c9c575b8b21b6485636a91ffecd10e558c62f6 # v3.5.0
5454

5555
# Initializes the CodeQL tools for scanning.
5656
- name: Initialize CodeQL
57-
uses: github/codeql-action/init@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8
57+
uses: github/codeql-action/init@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
5858
with:
5959
languages: ${{ matrix.language }}
6060
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -68,7 +68,7 @@ jobs:
6868
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
6969
# If this step fails, then you should remove it and run the build manually (see below)
7070
- name: Autobuild
71-
uses: github/codeql-action/autobuild@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8
71+
uses: github/codeql-action/autobuild@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
7272

7373
# ℹ️ Command-line programs to run using the OS shell.
7474
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -81,6 +81,6 @@ jobs:
8181
# ./location_of_script_within_repo/buildscript.sh
8282

8383
- name: Perform CodeQL Analysis
84-
uses: github/codeql-action/analyze@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8
84+
uses: github/codeql-action/analyze@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
8585
with:
8686
category: "/language:${{matrix.language}}"

.github/workflows/create-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
with:
3737
token: ${{ steps.generate_github_token.outputs.token }}
3838

39-
- uses: gradle/wrapper-validation-action@216d1ad2b3710bf005dc39237337b9673fd8fcd5 # v3.3.2
39+
- uses: gradle/wrapper-validation-action@f9c9c575b8b21b6485636a91ffecd10e558c62f6 # v3.5.0
4040

4141
- uses: jenschude/auto-create-pr-action@a5369414c74963e6ec065dab49066d3711b8c1db # v0.3.2
4242
if: github.ref_name == 'gen-sdk-updates'

.github/workflows/docs.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,15 @@ jobs:
5454
distribution: 'temurin'
5555
java-version: '17'
5656

57-
- uses: gradle/wrapper-validation-action@216d1ad2b3710bf005dc39237337b9673fd8fcd5 # v3.3.2
57+
- uses: gradle/wrapper-validation-action@f9c9c575b8b21b6485636a91ffecd10e558c62f6 # v3.5.0
5858

5959
- name: Setup Graphviz
6060
uses: ts-graphviz/setup-graphviz@b1de5da23ed0a6d14e0aeee8ed52fdd87af2363c # v2.0.2
6161

62-
- run: ./gradlew -Pversion=${{ github.event.inputs.version }} alljavadoc
62+
- run: ./gradlew -Pversion=$VERSION alljavadoc
6363
working-directory: sdk
64+
env:
65+
VERSION: ${{ github.event.inputs.version }}
6466

6567
- run: rsync -r sdk/build/docs/javadoc/ doc/javadoc
6668

0 commit comments

Comments
 (0)