diff --git a/.woodpecker.yml b/.woodpecker.yml index c4839c0..2bcf9e1 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -2,11 +2,9 @@ pipeline: frontend: image: node:16-alpine commands: - # - ( cd client && yarn install ) - # - ( cd client/ && yarn generate ) + - ( cd client && yarn install ) + - ( cd client/ && yarn generate ) - mkdir -p client/.output/public/ - when: - branch: woodpecker backend: image: golang:1.18-alpine @@ -15,8 +13,7 @@ pipeline: - apk add make - make -C server setup - make -C server build - when: - branch: woodpecker + - cp srver/knowyt build/files/ build-publish: image: mtvb/drone-kaniko @@ -29,8 +26,6 @@ pipeline: repo: knowyt registry: docker.private.gnuher.de tags: latest - when: - branch: woodpecker notify: image: plugins/matrix @@ -41,3 +36,7 @@ pipeline: from_secret: matrix.bw-messenger.de.username password: from_secret: matrix.bw-messenger.de.password + +branches: + - woodpecker + - prod diff --git a/Makefile b/Makefile index 16e1d88..1e5db90 100644 --- a/Makefile +++ b/Makefile @@ -52,7 +52,7 @@ build: $(MAKE) podman-save podman-build: - cp server/knowyt build/files/ + cp ./knowyt ../build/files/ podman build --tag knowyt:$(VERSION) . podman-save: