Skip to content

Commit 7321f7e

Browse files
JanCizmarstepan662Martin005
authored
feat: Granular permissions, new pricing, self-hosted EE licensing (tolgee#1726)
Co-authored-by: Štěpán Granát <[email protected]> Co-authored-by: Martin Chrástek <[email protected]>
1 parent 97c2400 commit 7321f7e

File tree

686 files changed

+43721
-11449
lines changed

Some content is hidden

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

686 files changed

+43721
-11449
lines changed

‎.github/workflows/prerelease-alpha.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ jobs:
1212
with:
1313
token: '${{ secrets.TOLGEE_MACHINE_PAT }}'
1414

15-
- uses: actions/setup-java@v2
15+
- uses: actions/setup-java@v3
1616
with:
17-
java-version: 11
17+
java-version: 17
1818
distribution: adopt
1919

2020
- name: Setup node
@@ -37,7 +37,7 @@ jobs:
3737

3838
- name: Set version property
3939
id: version
40-
run: echo ::set-output name=VERSION::$(test -e .VERSION && echo v$(cat .VERSION))
40+
run: echo "VERSION=$(test -e .VERSION && echo v$(cat .VERSION))" >> $GITHUB_OUTPUT
4141

4242
- name: BootJar with version
4343
if: ${{ steps.version.outputs.VERSION != '' }}
@@ -90,7 +90,7 @@ jobs:
9090
env:
9191
KUBERNETES_DO_SERVICE_CONFIG: ${{secrets.KUBERNETES_DO_SERVICE_CONFIG}}
9292

93-
- uses: actions/upload-artifact@v2
93+
- uses: actions/upload-artifact@v3
9494
if: always()
9595
with:
9696
name: test

‎.github/workflows/preview.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ jobs:
1414
steps:
1515
- uses: actions/checkout@v3
1616

17-
- uses: actions/setup-java@v2
17+
- uses: actions/setup-java@v3
1818
with:
19-
java-version: 11
19+
java-version: 17
2020
distribution: adopt
2121

2222
- name: Setup node
@@ -40,7 +40,7 @@ jobs:
4040

4141
- name: Set version
4242
id: version
43-
run: echo ::set-output name=VERSION::$(echo $GITHUB_REF | sed -e 's/refs\/tags\///g' -e 's/\//-/g')
43+
run: echo "VERSION=$(echo $GITHUB_REF | sed -e 's/refs\/tags\///g' -e 's/\//-/g')" >> $GITHUB_OUTPUT
4444

4545
- name: Prepare for docker build
4646
run: ./gradlew dockerPrepare

‎.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ jobs:
1616
with:
1717
token: '${{ secrets.TOLGEE_MACHINE_PAT }}'
1818

19-
- uses: actions/setup-java@v2
19+
- uses: actions/setup-java@v3
2020
with:
21-
java-version: 11
21+
java-version: 17
2222
distribution: adopt
2323

2424
- name: Setup node
@@ -41,7 +41,7 @@ jobs:
4141

4242
- name: Set version property
4343
id: version
44-
run: echo ::set-output name=VERSION::$(test -e .VERSION && echo v$(cat .VERSION))
44+
run: echo "VERSION=$(test -e .VERSION && echo v$(cat .VERSION))" >> $GITHUB_OUTPUT
4545

4646
- name: BootJar with version
4747
if: ${{ steps.version.outputs.VERSION != '' }}
@@ -86,7 +86,7 @@ jobs:
8686
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8787
VERSION: ${{ steps.version.outputs.VERSION }}
8888

89-
- uses: actions/upload-artifact@v2
89+
- uses: actions/upload-artifact@v3
9090
if: always()
9191
with:
9292
name: test

‎.github/workflows/reportIntermittentTests.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ jobs:
1111
steps:
1212
- uses: actions/checkout@v3
1313

14-
- uses: actions/setup-java@v2
14+
- uses: actions/setup-java@v3
1515
with:
16-
java-version: 11
16+
java-version: 17
1717
distribution: adopt
1818

1919
- name: Setup node
@@ -41,7 +41,7 @@ jobs:
4141
- name: Tar Testing build
4242
run: tar -czf ~/backend-testing.tgz ./backend/testing/build
4343

44-
- uses: actions/upload-artifact@v2
44+
- uses: actions/upload-artifact@v3
4545
if: always()
4646
with:
4747
name: backend
@@ -60,9 +60,9 @@ jobs:
6060
steps:
6161
- uses: actions/checkout@v3
6262

63-
- uses: actions/setup-java@v2
63+
- uses: actions/setup-java@v3
6464
with:
65-
java-version: 11
65+
java-version: 17
6666
distribution: adopt
6767

6868
- name: Setup node
@@ -85,7 +85,7 @@ jobs:
8585
key: cache-node-modules-${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
8686

8787
- name: Download backend build result
88-
uses: actions/download-artifact@v2
88+
uses: actions/download-artifact@v3
8989
with:
9090
name: backend
9191
path: ~/
@@ -94,13 +94,13 @@ jobs:
9494
run: tar -xzf ~/backend-app.tgz ./backend/app/build
9595

9696
- name: Download frontend build result
97-
uses: actions/download-artifact@v2
97+
uses: actions/download-artifact@v3
9898
with:
9999
name: webapp
100100
path: ./webapp/build
101101

102102
- name: Download dependencies
103-
uses: actions/download-artifact@v2
103+
uses: actions/download-artifact@v3
104104
with:
105105
name: e2e_deps
106106
path: ~/
@@ -132,7 +132,7 @@ jobs:
132132
E2E_TOTAL_JOBS: ${{matrix.total_jobs}}
133133
E2E_JOB_INDEX: ${{matrix.job_index}}
134134

135-
- uses: actions/upload-artifact@v2
135+
- uses: actions/upload-artifact@v3
136136
if: failure()
137137
with:
138138
name: e2e ${{ matrix.job_index }}
@@ -146,9 +146,9 @@ jobs:
146146
steps:
147147
- uses: actions/checkout@v3
148148

149-
- uses: actions/setup-java@v2
149+
- uses: actions/setup-java@v3
150150
with:
151-
java-version: 11
151+
java-version: 17
152152
distribution: adopt
153153

154154
- name: Cache Gradle packages
@@ -177,7 +177,7 @@ jobs:
177177
TOLGEE_API_URL: ${{secrets.TOLGEE_API_URL}}
178178

179179
- name: Upload built webapp
180-
uses: actions/upload-artifact@v2
180+
uses: actions/upload-artifact@v3
181181
with:
182182
name: webapp
183183
path: webapp/build
@@ -212,7 +212,7 @@ jobs:
212212
tar -czf ~/cypress_cache.tgz ./Cypress
213213
working-directory: /home/runner/.cache/
214214

215-
- uses: actions/upload-artifact@v2
215+
- uses: actions/upload-artifact@v3
216216
if: always()
217217
with:
218218
name: e2e_deps

‎.github/workflows/test.yml

Lines changed: 28 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ jobs:
1212
steps:
1313
- uses: actions/checkout@v3
1414

15-
- uses: actions/setup-java@v2
15+
- uses: actions/setup-java@v3
1616
with:
17-
java-version: 11
17+
java-version: 17
1818
distribution: adopt
1919

2020
- name: Setup node
@@ -42,14 +42,18 @@ jobs:
4242
- name: Tar Testing build
4343
run: tar -czf ~/backend-testing.tgz ./backend/testing/build
4444

45-
- uses: actions/upload-artifact@v2
45+
- name: Tar Deployment build
46+
run: tar -czf ~/backend-development.tgz ./backend/development/build
47+
48+
- uses: actions/upload-artifact@v3
4649
if: always()
4750
with:
4851
name: backend
4952
path: |
5053
~/backend-app.tgz
5154
~/backend-data.tgz
5255
~/backend-testing.tgz
56+
~/backend-development.tgz
5357
5458
backend-test:
5559
name: Backend testing ‍🔎
@@ -62,14 +66,15 @@ jobs:
6266
[
6367
"server-app:runContextRecreatingTests",
6468
"server-app:runStandardTests",
69+
"ee-test:test",
6570
"data:test",
6671
]
6772
steps:
6873
- uses: actions/checkout@v3
6974

70-
- uses: actions/setup-java@v2
75+
- uses: actions/setup-java@v3
7176
with:
72-
java-version: 11
77+
java-version: 17
7378
distribution: adopt
7479

7580
- name: Setup node
@@ -86,7 +91,7 @@ jobs:
8691
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
8792

8893
- name: Download backend build result
89-
uses: actions/download-artifact@v2
94+
uses: actions/download-artifact@v3
9095
with:
9196
name: backend
9297
path: ~/
@@ -96,6 +101,8 @@ jobs:
96101
tar -xzf ~/backend-app.tgz ./backend/app/build
97102
tar -xzf ~/backend-data.tgz ./backend/data/build
98103
tar -xzf ~/backend-testing.tgz ./backend/testing/build
104+
tar -xzf ~/backend-development.tgz ./backend/development/build
105+
99106
100107
- name: Run backend tests
101108
run: ./gradlew ${{ matrix.command }}
@@ -106,9 +113,9 @@ jobs:
106113
id: reportName
107114
run: |
108115
reportName=${{ matrix.command }}
109-
echo "::set-output name=reportName::${reportName//\:/_}"
116+
echo "reportName=${reportName//\:/_}" >> $GITHUB_OUTPUT
110117
111-
- uses: actions/upload-artifact@v2
118+
- uses: actions/upload-artifact@v3
112119
if: always()
113120
with:
114121
name: backend_test_reports_${{ steps.version.outputs.reportName }}
@@ -127,9 +134,9 @@ jobs:
127134
steps:
128135
- uses: actions/checkout@v3
129136

130-
- uses: actions/setup-java@v2
137+
- uses: actions/setup-java@v3
131138
with:
132-
java-version: 11
139+
java-version: 17
133140
distribution: adopt
134141

135142
- name: Setup node
@@ -152,7 +159,7 @@ jobs:
152159
key: cache-node-modules-${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
153160

154161
- name: Download backend build result
155-
uses: actions/download-artifact@v2
162+
uses: actions/download-artifact@v3
156163
with:
157164
name: backend
158165
path: ~/
@@ -161,13 +168,13 @@ jobs:
161168
run: tar -xzf ~/backend-app.tgz ./backend/app/build
162169

163170
- name: Download frontend build result
164-
uses: actions/download-artifact@v2
171+
uses: actions/download-artifact@v3
165172
with:
166173
name: webapp
167174
path: ./webapp/build
168175

169176
- name: Download dependencies
170-
uses: actions/download-artifact@v2
177+
uses: actions/download-artifact@v3
171178
with:
172179
name: e2e_deps
173180
path: ~/
@@ -196,7 +203,7 @@ jobs:
196203
E2E_TOTAL_JOBS: ${{matrix.total_jobs}}
197204
E2E_JOB_INDEX: ${{matrix.job_index}}
198205

199-
- uses: actions/upload-artifact@v2
206+
- uses: actions/upload-artifact@v3
200207
if: failure()
201208
with:
202209
name: e2e
@@ -205,7 +212,7 @@ jobs:
205212
./e2e/cypress/screenshots/**/*
206213
./e2e/server
207214
208-
- uses: actions/upload-artifact@v2
215+
- uses: actions/upload-artifact@v3
209216
if: failure()
210217
with:
211218
name: e2e_server_log_${{ matrix.job_index }}
@@ -218,9 +225,9 @@ jobs:
218225
steps:
219226
- uses: actions/checkout@v3
220227

221-
- uses: actions/setup-java@v2
228+
- uses: actions/setup-java@v3
222229
with:
223-
java-version: 11
230+
java-version: 17
224231
distribution: adopt
225232

226233
- name: Cache Gradle packages
@@ -249,7 +256,7 @@ jobs:
249256
TOLGEE_API_URL: ${{secrets.TOLGEE_API_URL}}
250257

251258
- name: Upload built webapp
252-
uses: actions/upload-artifact@v2
259+
uses: actions/upload-artifact@v3
253260
with:
254261
name: webapp
255262
path: webapp/build
@@ -355,7 +362,7 @@ jobs:
355362
tar -czf ~/cypress_cache.tgz ./Cypress
356363
working-directory: /home/runner/.cache/
357364

358-
- uses: actions/upload-artifact@v2
365+
- uses: actions/upload-artifact@v3
359366
if: always()
360367
with:
361368
name: e2e_deps
@@ -369,9 +376,9 @@ jobs:
369376
steps:
370377
- uses: actions/checkout@v3
371378

372-
- uses: actions/setup-java@v2
379+
- uses: actions/setup-java@v3
373380
with:
374-
java-version: 11
381+
java-version: 17
375382
distribution: adopt
376383

377384
- name: Setup node

‎LICENSE

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
Copyright (c) 2023 Tolgee s.r.o.
2+
3+
Tolgee monorepo uses multiple licenses. Portions of this software are licensed as follows:
4+
- All content that resides under the "ee/" and "/webapp/src/ee" directory of this repository, is licensed under the license defined in "ee/LICENSE".
5+
- Content outside of the above mentioned directories or restrictions defaults to the "Apache License 2.0" license, as defined below.
6+
7+
Reach out ([email protected]) if you have any questions regarding licenses.
8+
9+
------------------------
10+
111
Apache License
212
Version 2.0, January 2004
313
http://www.apache.org/licenses/

‎backend/app/build.gradle

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,17 @@ dependencies {
157157
* MISC MODULE
158158
*/
159159
implementation(project(':misc'))
160+
161+
/**
162+
* EE MODULE
163+
*/
164+
implementation(project(':ee-app'))
165+
166+
167+
/**
168+
* Dev module
169+
*/
170+
implementation(project(':development'))
160171
}
161172

162173
test {
@@ -224,3 +235,7 @@ sourceSets {
224235
jar {
225236
duplicatesStrategy(DuplicatesStrategy.EXCLUDE)
226237
}
238+
239+
bootJar {
240+
duplicatesStrategy(DuplicatesStrategy.EXCLUDE)
241+
}

0 commit comments

Comments
 (0)