Skip to content

Commit 3427867

Browse files
erezrokaherezrokah
committed
fix: resolve merge conflicts, update CLI version to 6.35.2
2 parents 671d0c5 + c704b92 commit 3427867

File tree

9 files changed

+88
-16
lines changed

9 files changed

+88
-16
lines changed

‎.github/renovate.json5‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,57 @@
33
"github>cloudquery/.github//.github/renovate-go-default.json5",
44
"github>cloudquery/.github//.github/renovate-node-default.json5",
55
],
6+
customManagers: [
7+
{
8+
// CLI version in README.md code example
9+
customType: "regex",
10+
fileMatch: ["^README\\.md$"],
11+
matchStrings: [
12+
"cloudquery/setup\\-cloudquery[\\s\\S]+?version\\:\\s+['\"]?(?<currentValue>[^'\"\\s]+)['\"]?",
13+
],
14+
packageNameTemplate: "cloudquery/cloudquery",
15+
depNameTemplate: "cli",
16+
datasourceTemplate: "github-releases",
17+
extractVersionTemplate: "^cli-(?<version>.+)$",
18+
},
19+
{
20+
// CLI version in example_matrix.yml (uses: ./. with version: "v6.8.0")
21+
customType: "regex",
22+
fileMatch: ["^\\.github/workflows/example_matrix\\.yml$"],
23+
matchStrings: [
24+
"version\\:\\s+[\"'](?<currentValue>[^\"']+)[\"']",
25+
],
26+
packageNameTemplate: "cloudquery/cloudquery",
27+
depNameTemplate: "cli",
28+
datasourceTemplate: "github-releases",
29+
extractVersionTemplate: "^cli-(?<version>.+)$",
30+
},
31+
{
32+
// CLI version without v prefix in example.yml matrix (first value: "6.8.0")
33+
customType: "regex",
34+
fileMatch: ["^\\.github/workflows/example\\.yml$"],
35+
matchStrings: [
36+
"cloudquery-version\\:\\s+\\[\"(?<currentValue>[^\"]+)\"",
37+
],
38+
packageNameTemplate: "cloudquery/cloudquery",
39+
depNameTemplate: "cli-no-v",
40+
datasourceTemplate: "github-releases",
41+
extractVersionTemplate: "^cli-v(?<version>.+)$",
42+
},
43+
{
44+
// CLI version with v prefix in example.yml matrix (second value: "v6.8.0")
45+
customType: "regex",
46+
fileMatch: ["^\\.github/workflows/example\\.yml$"],
47+
matchStrings: [
48+
"cloudquery-version\\:\\s+\\[\"[^\"]+\",\\s*\"(?<currentValue>[^\"]+)\"",
49+
],
50+
packageNameTemplate: "cloudquery/cloudquery",
51+
depNameTemplate: "cli",
52+
datasourceTemplate: "github-releases",
53+
extractVersionTemplate: "^cli-(?<version>.+)$",
54+
},
55+
],
56+
"github-actions": {
57+
fileMatch: ["^README\\.md$"],
58+
},
659
}

‎.github/workflows/example.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ jobs:
2222
include:
2323
- label: "without-v-prefix"
2424
dbversion: "postgres:latest"
25-
cloudquery-version: "6.8.0"
25+
cloudquery-version: "6.35.2"
2626
os: ubuntu-latest
2727
- label: "with-v-prefix"
2828
dbversion: "postgres:latest"
29-
cloudquery-version: "v6.8.0"
29+
cloudquery-version: "v6.35.2"
3030
os: ubuntu-latest
3131
fail-fast: false
3232
services:
@@ -46,7 +46,7 @@ jobs:
4646
--health-retries 5
4747
timeout-minutes: 30
4848
steps:
49-
- uses: actions/checkout@v6
49+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
5050
- name: Configure AWS credentials
5151
uses: aws-actions/configure-aws-credentials@8df5847569e6427dd6c4fb1cf565c83acfa8afa7 # v6
5252
with:

‎.github/workflows/example_matrix.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
permissions:
99
contents: read
1010
env:
11-
CLOUDQUERY_VERSION: "v6.8.0"
11+
CLOUDQUERY_VERSION: "v6.35.2"
1212
jobs:
1313
cloudquery:
1414
permissions:
@@ -34,7 +34,7 @@ jobs:
3434
--health-timeout 5s
3535
--health-retries 5
3636
steps:
37-
- uses: actions/checkout@v6 # Checkout the code so we have access to the config file
37+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 # Checkout the code so we have access to the config file
3838
- name: Configure AWS credentials
3939
uses: aws-actions/configure-aws-credentials@8df5847569e6427dd6c4fb1cf565c83acfa8afa7 # v6
4040
with:

‎.github/workflows/prepare.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ jobs:
1010
prepare-dist:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v6
13+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
1414
with:
1515
token: ${{ secrets.GH_CQ_BOT }}
16-
- uses: actions/setup-node@v6
16+
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6
1717
with:
1818
node-version: "lts/*"
1919
cache: "npm"
2020
- name: Install dependencies
2121
run: npm ci
22-
- uses: stefanzweifel/git-auto-commit-action@v7
22+
- uses: stefanzweifel/git-auto-commit-action@04702edda442b2e678b25b537cec683a1493fcb9 # v7
2323
with:
2424
commit_message: "chore: Prepare dist"

‎.github/workflows/release-please.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ jobs:
1111
release-please:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: GoogleCloudPlatform/release-please-action@v4
14+
- uses: GoogleCloudPlatform/release-please-action@16a9c90856f42705d54a6fda1823352bdc62cf38 # v4
1515
with:
1616
token: ${{ secrets.GH_CQ_BOT }}
17-
release-type: node

‎.github/workflows/test.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ jobs:
1414
test:
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@v6
17+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
1818
- name: Use Node.js
19-
uses: actions/setup-node@v6
19+
uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6
2020
with:
2121
node-version: "lts/*"
2222
cache: "npm"

‎.release-please-manifest.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
".": "5.0.0"
3+
}

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,20 @@ jobs:
2525
runs-on: ubuntu-latest
2626
steps:
2727
# Checkout a git repository with a pre-existing CloudQuery configuration files
28-
- uses: actions/checkout@v4
28+
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
2929

3030
# Setup AWS credentials (example)
3131
- name: Configure AWS credentials
32-
uses: aws-actions/configure-aws-credentials@v4
32+
uses: aws-actions/configure-aws-credentials@7474bc4690e29a8392af63c5b98e7449536d5c3a # v4
3333
with:
3434
role-to-assume: <role-arn>
3535
aws-region: <region>
3636

37-
- uses: cloudquery/setup-cloudquery@v3
37+
- uses: cloudquery/setup-cloudquery@ac7302f8eab40c6d17c16535fbc302d8bdc12d7f # v5.0.0 # x-release-please-version
3838
name: Setup CloudQuery
3939
with:
4040
# Required. Must be a valid SemVer version
41-
version: 'v5.12.1'
41+
version: 'v6.35.2'
4242

4343
- name: Sync with CloudQuery
4444
run: cloudquery sync [file or directories...] --log-console

‎release-please-config.json‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json",
3+
"bootstrap-sha": "ac7302f8eab40c6d17c16535fbc302d8bdc12d7f",
4+
"include-component-in-tag": false,
5+
"packages": {
6+
".": {
7+
"release-type": "node",
8+
"extra-files": [
9+
{
10+
"type": "generic",
11+
"path": "README.md",
12+
"glob": false
13+
}
14+
]
15+
}
16+
}
17+
}

0 commit comments

Comments
 (0)