Skip to content

Commit 33b5af8

Browse files
committed
Fix build
1 parent 811191d commit 33b5af8

4 files changed

Lines changed: 72 additions & 20 deletions

File tree

.github/workflows/build.yml

Lines changed: 43 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,41 @@
1-
name: Build project
2-
on: [ push ]
1+
name: Build
2+
on:
3+
push:
4+
branches:
5+
- master
6+
paths:
7+
- .github/**
8+
- openapi/**
9+
- client/**
10+
- integration-test/**
11+
- deploy/**
12+
- build.gradle
13+
- gradle.properties
14+
315
jobs:
416
build:
517
name: Build
618
runs-on: ubuntu-latest
719
steps:
8-
- uses: actions/checkout@v3
20+
- uses: actions/checkout@v4
921

10-
- uses: actions/setup-java@v3
22+
- uses: actions/setup-java@v4
1123
with:
1224
distribution: "corretto"
1325
java-version: "17"
1426
cache: "gradle"
1527

1628
- name: Install tflint
17-
uses: terraform-linters/setup-tflint@v3
29+
uses: terraform-linters/setup-tflint@v4
1830

1931
- name: Validate
2032
uses: pre-commit/action@v3.0.0
2133

2234
- name: Build project
23-
uses: eskatos/gradle-command-action@v2
24-
with:
25-
arguments: clean build
35+
run: ./gradlew clean build
2636

2737
- name: Upload Admin build
28-
uses: actions/upload-artifact@v3
38+
uses: actions/upload-artifact@v4
2939
with:
3040
name: jar
3141
retention-days: 1
@@ -36,11 +46,11 @@ jobs:
3646
runs-on: ubuntu-latest
3747
needs: build
3848
steps:
39-
- uses: actions/checkout@v3
49+
- uses: actions/checkout@v4
4050

4151
- uses: docker/setup-buildx-action@v2
4252

43-
- uses: actions/download-artifact@v3
53+
- uses: actions/download-artifact@v4
4454
with:
4555
name: jar
4656
path: server/build/libs/
@@ -60,9 +70,7 @@ jobs:
6070
cache: "gradle"
6171

6272
- name: Build project
63-
uses: eskatos/gradle-command-action@v2
64-
with:
65-
arguments: :integration-test:integrationTest
73+
run: ./gradlew :integration-test:integrationTest
6674

6775
- name: Stop containers
6876
if: always()
@@ -74,7 +82,7 @@ jobs:
7482
runs-on: ubuntu-latest
7583
needs: test
7684
steps:
77-
- uses: actions/checkout@v3
85+
- uses: actions/checkout@v4
7886

7987
- uses: docker/setup-buildx-action@v2
8088

@@ -84,7 +92,7 @@ jobs:
8492
username: ${{ secrets.DOCKER_HUB_USERNAME }}
8593
password: ${{ secrets.DOCKER_HUB_TOKEN }}
8694

87-
- uses: actions/download-artifact@v3
95+
- uses: actions/download-artifact@v4
8896
with:
8997
name: jar
9098
path: server/build/libs/
@@ -93,8 +101,24 @@ jobs:
93101
timeout-minutes: 5
94102
run: docker compose build
95103

96-
- name: Push images
97-
run: docker compose push
104+
- name: Build and push
105+
uses: docker/build-push-action@v6
106+
with:
107+
context: .
108+
file: server/Dockerfile
109+
platforms: linux/amd64,linux/arm64
110+
tags: romanowalex/servers:${{ github.ref_name }}
111+
push: true
112+
113+
- name: Docker Hub Description
114+
uses: peter-evans/dockerhub-description@v4
115+
with:
116+
readme-filepath: Docker-README.md
117+
repository: romanowalex/openapi-generation
118+
username: ${{ secrets.DOCKER_HUB_USERNAME }}
119+
password: ${{ secrets.DOCKER_HUB_TOKEN }}
120+
short-description: ${{ github.event.repository.description }}
121+
enable-url-completion: true
98122

99123
deploy:
100124
name: Deploy DigitalOcean app
@@ -103,7 +127,7 @@ jobs:
103127
environment:
104128
name: digitalocean
105129
steps:
106-
- uses: actions/checkout@v3
130+
- uses: actions/checkout@v4
107131

108132
- name: Terraform deploy
109133
run: |

Docker-README.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
[![CI](https://github.com/Romanow/openapi-generation/actions/workflows/build.yml/badge.svg?branch=master)](https://github.com/Romanow/openapi-generation/actions/workflows/build.yml)
2+
[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit)](https://github.com/pre-commit/pre-commit)
3+
[![Servers](https://img.shields.io/docker/pulls/romanowalex/servers?logo=docker)](https://hub.docker.com/r/romanowalex/servers)
4+
[![License](https://img.shields.io/github/license/Romanow/openapi-generation)](https://github.com/Romanow/openapi-generation/blob/main/LICENSE)
5+
6+
# Contract First или страх и ненависть в королевстве CodeGen
7+
8+
GitHub: [romanow/openapi-generation](https://github.com/Romanow/openapi-generation).
9+
10+
[Описание API](openapi/servers.yml).
11+
12+
## Локальный запуск
13+
14+
Используем [docker-compose.yml](docker-compose.yml)
15+
16+
```shell
17+
$ ./gradlew clean build
18+
$ docker compose build
19+
$ docker compose up -d --wait
20+
```

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
[![Build project](https://github.com/Romanow/openapi-generation/actions/workflows/build.yml/badge.svg?branch=master)](https://github.com/Romanow/openapi-generation/actions/workflows/build.yml)
1+
[![CI](https://github.com/Romanow/openapi-generation/actions/workflows/build.yml/badge.svg?branch=master)](https://github.com/Romanow/openapi-generation/actions/workflows/build.yml)
22
[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit)](https://github.com/pre-commit/pre-commit)
3+
[![Servers](https://img.shields.io/docker/pulls/romanowalex/servers?logo=docker)](https://hub.docker.com/r/romanowalex/servers)
4+
[![License](https://img.shields.io/github/license/Romanow/openapi-generation)](https://github.com/Romanow/openapi-generation/blob/main/LICENSE)
35

46
# Contract First или страх и ненависть в королевстве CodeGen
57

openapi/servers.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ paths:
1111
tags:
1212
- server
1313
summary: Получить информацию о сервере по ID
14+
operationId: getById
1415
parameters:
1516
- name: id
1617
in: path
@@ -29,6 +30,7 @@ paths:
2930
tags:
3031
- server
3132
summary: Полное обновление информации о сервере
33+
operationId: fullUpdate
3234
parameters:
3335
- name: id
3436
in: path
@@ -53,6 +55,7 @@ paths:
5355
tags:
5456
- server
5557
summary: Удалить сервер
58+
operationId: delete
5659
parameters:
5760
- name: id
5861
in: path
@@ -67,6 +70,7 @@ paths:
6770
tags:
6871
- server
6972
summary: Обновление информации о сервере
73+
operationId: partialUpdate
7074
parameters:
7175
- name: id
7276
in: path
@@ -92,6 +96,7 @@ paths:
9296
tags:
9397
- server
9498
summary: Получить список всех серверов
99+
operationId: all
95100
responses:
96101
'200':
97102
description: Информация о сервере
@@ -103,6 +108,7 @@ paths:
103108
tags:
104109
- server
105110
summary: Создать новый сервер
111+
operationId: create
106112
requestBody:
107113
content:
108114
application/json:

0 commit comments

Comments
 (0)