Skip to content

Commit 239b7cb

Browse files
mridangmridang
committed
Merge branch 'beta' into feat/implement-eap-qodana
2 parents f5b34ae + 1fc12bb commit 239b7cb

File tree

1,410 files changed

+229294
-12144
lines changed

Some content is hidden

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

1,410 files changed

+229294
-12144
lines changed

‎.github/dependabot.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ updates:
4646
prefix: "chore(deps):"
4747
open-pull-requests-limit: 10
4848
groups:
49-
actions-version-updates:
49+
docker-version-updates:
5050
patterns:
5151
- "*"
5252
applies-to: "version-updates"
53-
actions-security-updates:
53+
docker-security-updates:
5454
patterns:
5555
- "*"
5656
applies-to: "security-updates"

‎.github/workflows/integration.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ubuntu-latest
2020
strategy:
2121
matrix:
22-
ruby-version: [ '3.0', '3.1', '3.2', '3.3' ]
22+
ruby-version: [ '3.0', '3.1', '3.2', '3.3', '3.4', '4.0' ]
2323
fail-fast: false
2424

2525
steps:
@@ -41,11 +41,13 @@ jobs:
4141
path: project/sanity
4242

4343
- name: Set up Ruby
44-
uses: ruby/setup-ruby@cb0fda56a307b8c78d38320cd40d9eb22a3bf04e # v1.242.0
44+
uses: ruby/setup-ruby@09a7688d3b55cf0e976497ff046b70949eeaccfd # v1.288.0
4545
with:
4646
ruby-version: ${{ matrix.ruby-version }}
47-
bundler-cache: true
48-
working-directory: project/sanity
47+
48+
- name: Remove lockfile
49+
working-directory: project/sanity
50+
run: rm -f Gemfile.lock
4951

5052
- name: Check Installability
5153
working-directory: project/sanity

‎.github/workflows/linting.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,8 @@ jobs:
3737
ref: ${{ inputs.ref }}
3838

3939
- name: Set up Ruby
40-
uses: ruby/setup-ruby@cb0fda56a307b8c78d38320cd40d9eb22a3bf04e # v1.242.0
40+
uses: ruby/setup-ruby@09a7688d3b55cf0e976497ff046b70949eeaccfd # v1.288.0
4141
with:
42-
ruby-version: '3.0'
4342
bundler-cache: true
4443

4544
- name: Install Dependencies

‎.github/workflows/pipeline.yml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@ name: Pipeline
22

33
on:
44
push:
5-
branches:
6-
- main
7-
pull_request:
85

96
permissions:
107
contents: write
@@ -72,7 +69,7 @@ jobs:
7269
name: Check Build Status
7370
runs-on: ubuntu-latest
7471
needs:
75-
# - lint-commits # Uncomment if commit linting should block release
72+
- lint-commits
7673
- code-style
7774
- compat-check
7875
- type-check

‎.github/workflows/release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
push:
55
branches:
66
- main
7+
- beta
78

89
permissions:
910
contents: write
@@ -32,9 +33,8 @@ jobs:
3233
fetch-depth: 0
3334

3435
- name: Set up Ruby
35-
uses: ruby/setup-ruby@cb0fda56a307b8c78d38320cd40d9eb22a3bf04e # v1.242.0
36+
uses: ruby/setup-ruby@09a7688d3b55cf0e976497ff046b70949eeaccfd # v1.288.0
3637
with:
37-
ruby-version: '3.0'
3838
bundler-cache: true
3939

4040
- name: Run semantic-release

‎.github/workflows/test.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,8 @@ jobs:
2828
ref: ${{ inputs.ref }}
2929

3030
- name: Set up Ruby
31-
uses: ruby/setup-ruby@cb0fda56a307b8c78d38320cd40d9eb22a3bf04e # v1.242.0
31+
uses: ruby/setup-ruby@09a7688d3b55cf0e976497ff046b70949eeaccfd # v1.288.0
3232
with:
33-
ruby-version: '3.0'
3433
bundler-cache: true
3534

3635
- name: Install Dependencies

‎.github/workflows/typecheck.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,8 @@ jobs:
3131
ref: ${{ inputs.ref }}
3232

3333
- name: Setup Ruby
34-
uses: ruby/setup-ruby@cb0fda56a307b8c78d38320cd40d9eb22a3bf04e # v1.242.0
34+
uses: ruby/setup-ruby@09a7688d3b55cf0e976497ff046b70949eeaccfd # v1.288.0
3535
with:
36-
ruby-version: '3.0'
3736
bundler-cache: true
3837

3938
- name: Install Dependencies

‎.releaserc.json‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
{
22
"branches": [
3-
"main"
3+
"main",
4+
{
5+
"name": "beta",
6+
"prerelease": "beta"
7+
}
48
],
59
"plugins": [
610
"@semantic-release/commit-analyzer",
@@ -20,7 +24,7 @@
2024
[
2125
"@semantic-release/exec",
2226
{
23-
"prepareCmd": "sed -i 's/[0-9]\\+\\.[0-9]\\+\\.[0-9]\\+/${nextRelease.version}/' lib/zitadel/client/version.rb"
27+
"prepareCmd": "sed -i 's/[0-9]\\+\\.[0-9]\\+\\.[0-9]\\+[-a-zA-Z0-9\\.]*/${nextRelease.version}/' lib/zitadel/client/version.rb"
2428
}
2529
],
2630
[
@@ -58,8 +62,7 @@
5862
{
5963
"message": "chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}",
6064
"assets": [
61-
"lib/zitadel/client/version.rb",
62-
"Gemfile.lock"
65+
"lib/zitadel/client/version.rb"
6366
]
6467
}
6568
]

‎.ruby-version‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
4.0

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ruby:3.3@sha256:06c1c61f615d408a44d8d6f3a06b1e1f9dd1882aecb91a6a9fc75fe93d051369
1+
FROM ruby:4.0
22
WORKDIR /app
33
COPY . .
44
RUN rm -f *.gem

0 commit comments

Comments
 (0)