diff --git a/.gitea/workflows/cicd-server.yml b/.gitea/workflows/cicd-server.yml index 1f627c1..c132bb6 100644 --- a/.gitea/workflows/cicd-server.yml +++ b/.gitea/workflows/cicd-server.yml @@ -30,6 +30,7 @@ jobs: - name: Check out code uses: actions/checkout@v3 - run: cd "${{ gitea.workspace }}/scnserver" && make clean + - run: cd "${{ gitea.workspace }}/scnserver" && make dgi - run: cd "${{ gitea.workspace }}/scnserver" && make docker - run: cd "${{ gitea.workspace }}/scnserver" && make push-docker @@ -60,21 +61,7 @@ jobs: run: go version - name: Run tests - run: cd "${{ gitea.workspace }}/scnserver" && make dgi && make swagger && SCN_TEST_LOGLEVEL=WARN make test - - - name: Send failure mail - if: failure() - uses: dawidd6/action-send-mail@v3 - with: - server_address: smtp.fastmail.com - server_port: 465 - secure: true - username: ${{secrets.MAIL_USERNAME}} - password: ${{secrets.MAIL_PASSWORD}} - subject: Pipeline on '${{ gitea.repository }}' failed - to: ${{ steps.commiter_info.outputs.MAIL }} - from: Gitea Actions - body: "Go to https://gogs.blackforestbytes.com/${{ gitea.repository }}/actions" + run: cd "${{ gitea.workspace }}/scnserver" && make generate && SCN_TEST_LOGLEVEL=WARN make test deploy_server: name: Deploy to Server diff --git a/scnserver/Dockerfile b/scnserver/Dockerfile index 940cede..dcdd72b 100644 --- a/scnserver/Dockerfile +++ b/scnserver/Dockerfile @@ -26,6 +26,7 @@ RUN apt-get update && \ rm -rf /var/lib/apt/lists COPY --from=builder /buildsrc/_build/scn_backend /app/server +COPY --from=builder /buildsrc/DOCKER_GIT_INFO /DOCKER_GIT_INFO RUN mkdir /data diff --git a/scnserver/Makefile b/scnserver/Makefile index 0c0a889..de7110e 100644 --- a/scnserver/Makefile +++ b/scnserver/Makefile @@ -58,6 +58,8 @@ swagger-setup: swagger: swagger-setup ".swaggobin/swag_$(SWAGGO_VERSION)" init -generalInfo ./api/router.go --propertyStrategy camelcase --output ./swagger/ --outputTypes "json,yaml" +generate: dgi enums ids swagger + pygmentize: website/scn_send.html website/scn_send.html: ../scn_send.sh