From a71b7d51a4ae6b54234de8bf97e69f4926289db6 Mon Sep 17 00:00:00 2001 From: Artyom Zaporozhets Date: Fri, 29 Aug 2025 11:23:17 +0300 Subject: [PATCH 1/5] #6: add basic CI checks --- .github/workflows/build.yml | 30 ++++++++++++++++++++++++++++++ .github/workflows/image-build.yml | 30 ++++++++++++++++++++++++++++++ makefile | 3 +++ 3 files changed, 63 insertions(+) create mode 100644 .github/workflows/build.yml create mode 100644 .github/workflows/image-build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..8e638e3 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,30 @@ +name: Build Application + +on: + push: + branches: [ main ] + pull_request: + branches: [ main ] + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Setup Node.js + uses: actions/setup-node@v4 + with: + node-version: '18' + cache: 'yarn' + + - name: Install dependencies + run: yarn install --frozen-lockfile + + - name: Generate code + run: make gen + + - name: Build application + run: make build diff --git a/.github/workflows/image-build.yml b/.github/workflows/image-build.yml new file mode 100644 index 0000000..4c01f5d --- /dev/null +++ b/.github/workflows/image-build.yml @@ -0,0 +1,30 @@ +name: Build Docker Image + +on: + push: + branches: [ main ] + pull_request: + branches: [ main ] + +jobs: + image-build: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Setup Node.js + uses: actions/setup-node@v4 + with: + node-version: '18' + cache: 'yarn' + + - name: Install dependencies + run: yarn install --frozen-lockfile + + - name: Generate code + run: make gen + + - name: Build Docker image + run: make image-build diff --git a/makefile b/makefile index 21ffaec..0c87dc9 100644 --- a/makefile +++ b/makefile @@ -3,6 +3,9 @@ GIT_VERSION = `git rev-parse --short main` run: yarn dev +build: + yarn build + gen: yarn run openapi-ts -i http://dm2.sao.ru:81/api/openapi.json -o ./src/clients/backend From 15c7aee0a42d4c6671fa8c96969734c897683f69 Mon Sep 17 00:00:00 2001 From: Artyom Zaporozhets Date: Fri, 29 Aug 2025 11:24:46 +0300 Subject: [PATCH 2/5] fix lock files --- .github/workflows/build.yml | 2 +- .github/workflows/image-build.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8e638e3..3b34597 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,7 +21,7 @@ jobs: cache: 'yarn' - name: Install dependencies - run: yarn install --frozen-lockfile + run: yarn install - name: Generate code run: make gen diff --git a/.github/workflows/image-build.yml b/.github/workflows/image-build.yml index 4c01f5d..4786c7f 100644 --- a/.github/workflows/image-build.yml +++ b/.github/workflows/image-build.yml @@ -21,7 +21,7 @@ jobs: cache: 'yarn' - name: Install dependencies - run: yarn install --frozen-lockfile + run: yarn install - name: Generate code run: make gen From 08fdd793c1013f6d05dfc0d9e533883e6526df9c Mon Sep 17 00:00:00 2001 From: Artyom Zaporozhets Date: Fri, 29 Aug 2025 11:25:43 +0300 Subject: [PATCH 3/5] fix lock files x2 --- .github/workflows/build.yml | 1 - .github/workflows/image-build.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3b34597..cda113d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,7 +18,6 @@ jobs: uses: actions/setup-node@v4 with: node-version: '18' - cache: 'yarn' - name: Install dependencies run: yarn install diff --git a/.github/workflows/image-build.yml b/.github/workflows/image-build.yml index 4786c7f..3c18fb9 100644 --- a/.github/workflows/image-build.yml +++ b/.github/workflows/image-build.yml @@ -18,7 +18,6 @@ jobs: uses: actions/setup-node@v4 with: node-version: '18' - cache: 'yarn' - name: Install dependencies run: yarn install From 2a1c4bdbcb66fc8e9de99fa9b71c7d5c85bae65d Mon Sep 17 00:00:00 2001 From: Artyom Zaporozhets Date: Fri, 29 Aug 2025 11:26:48 +0300 Subject: [PATCH 4/5] fix node version --- .github/workflows/build.yml | 2 +- .github/workflows/image-build.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cda113d..ec607f5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v4 with: - node-version: '18' + node-version: '20' - name: Install dependencies run: yarn install diff --git a/.github/workflows/image-build.yml b/.github/workflows/image-build.yml index 3c18fb9..1fec96f 100644 --- a/.github/workflows/image-build.yml +++ b/.github/workflows/image-build.yml @@ -17,7 +17,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v4 with: - node-version: '18' + node-version: '20' - name: Install dependencies run: yarn install From 117dc1240f8fc564658af42bd47dde86192fa384 Mon Sep 17 00:00:00 2001 From: Artyom Zaporozhets Date: Fri, 29 Aug 2025 11:37:06 +0300 Subject: [PATCH 5/5] fix head --- makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefile b/makefile index 0c87dc9..a3f2062 100644 --- a/makefile +++ b/makefile @@ -1,4 +1,4 @@ -GIT_VERSION = `git rev-parse --short main` +GIT_VERSION = `git rev-parse --short HEAD` run: yarn dev