Skip to content

Commit 43661e9

Browse files
authored
Merge branch 'master' into dependabot/maven/master/org.apache.maven.plugins-maven-enforcer-plugin-3.6.2
2 parents e660c45 + f0ee380 commit 43661e9

File tree

235 files changed

+12456
-234
lines changed

Some content is hidden

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

235 files changed

+12456
-234
lines changed
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
name: Documentation issue
2+
description: Any issue for documentation
3+
title: ":book: "
4+
labels: ["documentation"]
5+
assignees: []
6+
7+
body:
8+
- type: markdown
9+
attributes:
10+
value: |
11+
Thanks for taking the time to fill out this documentation issue!
12+
13+
- type: input
14+
id: contact
15+
attributes:
16+
label: Contact Details
17+
description: How can we get in touch with you if we need more info?
18+
placeholder: ex. email@example.com
19+
validations:
20+
required: false
21+
22+
- type: input
23+
id: documentation-version
24+
attributes:
25+
label: Documentation version
26+
description: Set up the version for which the issue is being set
27+
placeholder: dev
28+
validations:
29+
required: true
30+
31+
- type: dropdown
32+
id: type
33+
attributes:
34+
label: Set up issue type
35+
multiple: true
36+
options:
37+
- Bug
38+
- Refactoring
39+
- Feature
40+
41+
- type: textarea
42+
id: issue-description
43+
attributes:
44+
label: Issue description
45+
description: Please, describe issue
46+
validations:
47+
required: true

.github/workflows/dev-documentation.yml

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ on:
66
- master
77
workflow_dispatch:
88

9+
env:
10+
CI_DOCKER_CACHE_PATH: ci/cache/docker
11+
912
# Мы хотим чтобы deploy в ветку gh-pages
1013
# происходили консистентно друг за другом
1114
concurrency:
@@ -19,25 +22,69 @@ jobs:
1922
deploy:
2023
name: Deploy dev documentation
2124
runs-on: ubuntu-22.04
25+
env:
26+
RENDERER_NETWORK: renderer-net
27+
RENDERER_IMAGE: plantuml/plantuml-server:jetty-v1.2026.0
28+
RENDERER_CONTAINER_NAME: renderer
2229
defaults:
2330
run:
2431
working-directory: documentation
2532
steps:
2633
- uses: actions/checkout@v6
2734
with:
2835
fetch-depth: 0
36+
37+
- name: Setup docker image cache
38+
id: docker-image-cache
39+
uses: actions/cache@v3
40+
with:
41+
path: ${{ env.CI_DOCKER_CACHE_PATH }}
42+
key: ${{ env.RENDERER_IMAGE }}
43+
44+
- name: Update docker image cache
45+
if: steps.docker-image-cache.outputs.cache-hit != 'true'
46+
working-directory: ${{ github.workspace }}
47+
run: |
48+
docker pull "$RENDERER_IMAGE"
49+
mkdir -p ${CI_DOCKER_CACHE_PATH}/${RENDERER_IMAGE}
50+
docker image save -o ${CI_DOCKER_CACHE_PATH}/${RENDERER_CONTAINER_NAME}.tar "$RENDERER_IMAGE"
51+
52+
- name: Load docker image cache
53+
if: steps.docker-image-cache.outputs.cache-hit == 'true'
54+
working-directory: ${{ github.workspace }}
55+
run: |
56+
docker image load -i ${CI_DOCKER_CACHE_PATH}/${RENDERER_CONTAINER_NAME}.tar
57+
58+
- name: Start renderer service locally
59+
run: |
60+
docker network create "$RENDERER_NETWORK"
61+
docker run -d -p 7036:8080 --name "$RENDERER_CONTAINER_NAME" --network "$RENDERER_NETWORK" "$RENDERER_IMAGE"
62+
63+
2964
- name: Configure Git user
3065
run: |
3166
git config user.email "actions@github.com"
3267
git config user.name "GitHub Actions"
68+
69+
3370
- name: Setup python
3471
uses: actions/setup-python@v5
3572
with:
3673
python-version: 3.x
3774
cache: 'pip'
75+
3876
- name: Download mkdocs plugins
3977
run: pip install -r requirements.txt
78+
4079
- name: Deploy documentation into gh-pages branch
4180
run: mike deploy dev --push
81+
4282
- name: Setup default version
4383
run: mike set-default dev --push
84+
85+
- name: Cleanup renderer container
86+
if: always()
87+
run: |
88+
docker rm -f "$RENDERER_CONTAINER_NAME"
89+
docker network rm -f "$RENDERER_NETWORK"
90+
docker rmi -f ${RENDERER_REGISTRY}${RENDERER_IMAGE}

.github/workflows/prepare_release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414

1515
jobs:
1616
release:
17-
runs-on: ubuntu-latest
17+
runs-on: ubuntu-20.04-self-hosted
1818
steps:
1919
- name: Checkout code
2020
uses: actions/checkout@v6

.github/workflows/release-documentation.yml

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ on:
88
required: true
99
type: string
1010

11+
env:
12+
CI_DOCKER_CACHE_PATH: ci/cache/docker
13+
1114
# Мы хотим чтобы deploy в ветку gh-pages
1215
# происходили консистентно друг за другом
1316
concurrency:
@@ -21,6 +24,10 @@ jobs:
2124
deploy:
2225
name: Deploy release documentation
2326
runs-on: ubuntu-22.04
27+
env:
28+
RENDERER_NETWORK: renderer-net
29+
RENDERER_IMAGE: plantuml/plantuml-server:jetty-v1.2026.0
30+
RENDERER_CONTAINER_NAME: renderer
2431
steps:
2532
- name: Validate semver tag format
2633
id: validate-tag
@@ -38,12 +45,39 @@ jobs:
3845
echo "✅ Valid tag: $TAG"
3946
echo "Version for docs: $VERSION"
4047
echo "version=$VERSION" >> $GITHUB_OUTPUT
48+
4149
- name: Checkout repository with tag
4250
uses: actions/checkout@v6
4351
with:
4452
ref: "${{ github.event.inputs.tag }}"
4553
fetch-depth: 0
4654

55+
- name: Setup docker image cache
56+
id: docker-image-cache
57+
uses: actions/cache@v3
58+
with:
59+
path: ${{ env.CI_DOCKER_CACHE_PATH }}
60+
key: ${{ env.RENDERER_IMAGE }}
61+
62+
- name: Update docker image cache
63+
if: steps.docker-image-cache.outputs.cache-hit != 'true'
64+
working-directory: ${{ github.workspace }}
65+
run: |
66+
docker pull "$RENDERER_IMAGE"
67+
mkdir -p ${CI_DOCKER_CACHE_PATH}/${RENDERER_IMAGE}
68+
docker image save -o ${CI_DOCKER_CACHE_PATH}/${RENDERER_CONTAINER_NAME}.tar "$RENDERER_IMAGE"
69+
70+
- name: Load docker image cache
71+
if: steps.docker-image-cache.outputs.cache-hit == 'true'
72+
working-directory: ${{ github.workspace }}
73+
run: |
74+
docker image load -i ${CI_DOCKER_CACHE_PATH}/${RENDERER_CONTAINER_NAME}.tar
75+
76+
- name: Start renderer service locally
77+
run: |
78+
docker network create "$RENDERER_NETWORK"
79+
docker run -d -p 7036:8080 --name "$RENDERER_CONTAINER_NAME" --network "$RENDERER_NETWORK" ${RENDERER_REGISTRY}${RENDERER_IMAGE}
80+
4781
- name: Configure Git user
4882
run: |
4983
git config user.email "actions@github.com"
@@ -66,3 +100,10 @@ jobs:
66100
# env:
67101
# # Для дебага, если нужно
68102
# MIKE_VERBOSE: 1
103+
104+
- name: Cleanup renderer container
105+
if: always()
106+
run: |
107+
docker rm -f "$RENDERER_CONTAINER_NAME"
108+
docker network rm -f "$RENDERER_NETWORK"
109+
docker rmi -f ${RENDERER_REGISTRY}${RENDERER_IMAGE}

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313

1414
jobs:
1515
release:
16-
runs-on: ubuntu-latest
16+
runs-on: ubuntu-20.04-self-hosted
1717
steps:
1818
- name: Checkout code
1919
uses: actions/checkout@v6
@@ -34,7 +34,7 @@ jobs:
3434

3535
- name: Publish to Maven Central
3636
run: |
37-
./mvnw -B clean deploy -PsonatypeRelease -DskipTests -pl '!jacoco-coverage-aggregate-report'
37+
./mvnw -B clean deploy -PsonatypeRelease -DskipTests -pl '!jacoco-coverage-aggregate-report,!documentation'
3838
env:
3939
MAVEN_USERNAME: ${{ secrets.MAVEN_CENTRAL_USER }}
4040
MAVEN_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}

.github/workflows/snapshot.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
jobs:
1111
publish-snapshot:
1212
if: "!contains(github.event.head_commit.message, '[maven-release-plugin]')"
13-
runs-on: ubuntu-latest
13+
runs-on: ubuntu-20.04-self-hosted
1414
steps:
1515
- name: Checkout code
1616
uses: actions/checkout@v6
@@ -27,7 +27,7 @@ jobs:
2727

2828
- name: Publish Snapshot to Maven Central
2929
run: |
30-
./mvnw -B clean deploy -PsonatypeSnapshot -DskipTests -pl '!jacoco-coverage-aggregate-report'
30+
./mvnw -B clean deploy -PsonatypeSnapshot -DskipTests -pl '!jacoco-coverage-aggregate-report,!documentation'
3131
env:
3232
MAVEN_USERNAME: ${{ secrets.MAVEN_CENTRAL_USER }}
3333
MAVEN_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}

.github/workflows/spotless.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ on:
2525

2626
jobs:
2727
spotless-check:
28-
runs-on: tarantool-delivery-runners
28+
runs-on: ubuntu-20.04-self-hosted
2929
continue-on-error: true
3030

3131
steps:

.github/workflows/tests.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ env:
3131

3232
jobs:
3333
tests-unit:
34-
runs-on: tarantool-delivery-runners
35-
timeout-minutes: 20
34+
runs-on: ubuntu-20.04-self-hosted
35+
timeout-minutes: 40
3636
steps:
3737
- uses: actions/checkout@v6
3838

@@ -64,12 +64,12 @@ jobs:
6464
# retention-days: 1
6565

6666
tests-box-integration:
67-
runs-on: tarantool-delivery-runners
67+
runs-on: ubuntu-20.04-self-hosted
6868
strategy:
6969
fail-fast: false
7070
matrix:
7171
tarantool-version: [ "2.11.8-ubuntu20.04", "3.0.1-old" ]
72-
timeout-minutes: 15
72+
timeout-minutes: 40
7373
steps:
7474
- uses: actions/checkout@v6
7575

@@ -123,12 +123,12 @@ jobs:
123123
# retention-days: 1
124124

125125
tests-crud-integration:
126-
runs-on: tarantool-delivery-runners
126+
runs-on: ubuntu-20.04-self-hosted
127127
strategy:
128128
fail-fast: false
129129
matrix:
130130
tarantool-version: [ "2.11.8-ubuntu20.04", "3.0.1-old" ]
131-
timeout-minutes: 25
131+
timeout-minutes: 40
132132
steps:
133133
- uses: actions/checkout@v6
134134

@@ -189,7 +189,7 @@ jobs:
189189
# - tests-crud-integration
190190
# - tests-ee
191191
# - tests-dr
192-
# runs-on: tarantool-delivery-runners
192+
# runs-on: ubuntu-20.04-self-hosted
193193
# steps:
194194
# - uses: actions/checkout@v6
195195

.github/workflows/unused/java-doc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ permissions:
1010

1111
jobs:
1212
javadoc-build:
13-
runs-on: tarantool-delivery-runners
13+
runs-on: ubuntu-20.04-self-hosted
1414
timeout-minutes: 10
1515
steps:
1616
- uses: actions/checkout@v6

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,4 @@ workbench.xmi
2323
.factorypath
2424
documentation/venv
2525
documentation/site
26+
documentation/target

0 commit comments

Comments
 (0)