From fe006d9656309cab84c6059f7648ba2c6ee1ca30 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Fri, 20 May 2022 05:31:19 +0200 Subject: [PATCH] Revert "tmp: fix to make ci run agian" This reverts commit e172b66d53d34894b216b397130c97f958c6ed4d. --- .woodpecker/binaries.yml | 140 ++++++++++++++++++------------------- .woodpecker/docs.yml | 18 ++--- .woodpecker/test.yml | 146 +++++++++++++++++++-------------------- .woodpecker/web.yml | 20 +++--- 4 files changed, 162 insertions(+), 162 deletions(-) diff --git a/.woodpecker/binaries.yml b/.woodpecker/binaries.yml index d247dd6bd..b4e4ad149 100644 --- a/.woodpecker/binaries.yml +++ b/.woodpecker/binaries.yml @@ -9,95 +9,95 @@ pipeline: - cd web/ - yarn install --frozen-lockfile - yarn build -# when: -# path: -# # related config files -# - ".woodpecker/binaries.yml" -# - "nfpm/*.yml" -# # go source code -# - "**/*.go" -# - "go.*" -# # web source code -# - "web/**" + when: + path: + # related config files + - ".woodpecker/binaries.yml" + - "nfpm/*.yml" + # go source code + - "**/*.go" + - "go.*" + # web source code + - "web/**" build-server: group: build image: golang:1.17 commands: - make release-server -# when: -# path: -# # related config files -# - ".woodpecker/binaries.yml" -# - "nfpm/*.yml" -# # go source code -# - "**/*.go" -# - "go.*" -# # web source code -# - "web/**" + when: + path: + # related config files + - ".woodpecker/binaries.yml" + - "nfpm/*.yml" + # go source code + - "**/*.go" + - "go.*" + # web source code + - "web/**" build-agent: group: build image: golang:1.17 commands: - make release-agent -# when: -# path: -# # related config files -# - ".woodpecker/binaries.yml" -# - "nfpm/*.yml" -# # go source code -# - "**/*.go" -# - "go.*" -# # web source code -# - "web/**" + when: + path: + # related config files + - ".woodpecker/binaries.yml" + - "nfpm/*.yml" + # go source code + - "**/*.go" + - "go.*" + # web source code + - "web/**" build-cli: group: build image: golang:1.17 commands: - make release-cli -# when: -# path: -# # related config files -# - ".woodpecker/binaries.yml" -# - "nfpm/*.yml" -# # go source code -# - "**/*.go" -# - "go.*" -# # web source code -# - "web/**" + when: + path: + # related config files + - ".woodpecker/binaries.yml" + - "nfpm/*.yml" + # go source code + - "**/*.go" + - "go.*" + # web source code + - "web/**" build-deb-rpm: group: bundle image: golang:1.17 commands: - make bundle -# when: -# path: -# # related config files -# - ".woodpecker/binaries.yml" -# - "nfpm/*.yml" -# # go source code -# - "**/*.go" -# - "go.*" -# # web source code -# - "web/**" + when: + path: + # related config files + - ".woodpecker/binaries.yml" + - "nfpm/*.yml" + # go source code + - "**/*.go" + - "go.*" + # web source code + - "web/**" checksums: image: golang:1.17 commands: - make release-checksums -# when: -# path: -# # related config files -# - ".woodpecker/binaries.yml" -# - "nfpm/*.yml" -# # go source code -# - "**/*.go" -# - "go.*" -# # web source code -# - "web/**" + when: + path: + # related config files + - ".woodpecker/binaries.yml" + - "nfpm/*.yml" + # go source code + - "**/*.go" + - "go.*" + # web source code + - "web/**" # TODO: upload build artifacts for pushes to ${CI_REPO_DEFAULT_BRANCH} @@ -106,16 +106,16 @@ pipeline: commands: - ls -la dist/*.* - cat dist/checksums.txt -# when: -# path: -# # related config files -# - ".woodpecker/binaries.yml" -# - "nfpm/*.yml" -# # go source code -# - "**/*.go" -# - "go.*" -# # web source code -# - "web/**" + when: + path: + # related config files + - ".woodpecker/binaries.yml" + - "nfpm/*.yml" + # go source code + - "**/*.go" + - "go.*" + # web source code + - "web/**" release: image: plugins/github-release diff --git a/.woodpecker/docs.yml b/.woodpecker/docs.yml index 6205bff62..9fe755da3 100644 --- a/.woodpecker/docs.yml +++ b/.woodpecker/docs.yml @@ -7,9 +7,9 @@ pipeline: - yarn build when: event: [push, pull_request] -# path: -# - "docs/**" -# - ".woodpecker/docs.yml" + path: + - "docs/**" + - ".woodpecker/docs.yml" deploy-preview: image: woodpeckerci/plugin-surge-preview:next @@ -23,9 +23,9 @@ pipeline: from_secret: GITHUB_TOKEN_SURGE when: event: pull_request -# path: -# - "docs/**" -# - ".woodpecker/docs.yml" + path: + - "docs/**" + - ".woodpecker/docs.yml" # TODO: add step to remove preview again after PR is closed (waiting for #286) deploy: @@ -52,7 +52,7 @@ pipeline: when: event: push branch: ${CI_REPO_DEFAULT_BRANCH} -# path: -# - "docs/**" -# - ".woodpecker/docs.yml" + path: + - "docs/**" + - ".woodpecker/docs.yml" diff --git a/.woodpecker/test.yml b/.woodpecker/test.yml index bd37f20b8..d8689ae6f 100644 --- a/.woodpecker/test.yml +++ b/.woodpecker/test.yml @@ -3,38 +3,38 @@ pipeline: image: woodpeckerci/woodpecker-cli:next-alpine commands: - woodpecker-cli lint -# when: -# path: -# - ".woodpecker/**" + when: + path: + - ".woodpecker/**" dummy-web: image: golang:1.17 commands: - mkdir -p web/dist/ - echo "test" > web/dist/index.html -# when: -# path: -# # related config files -# - ".woodpecker/test.yml" -# # go source code -# - "**/*.go" -# - "go.*" -# # schema changes -# - "pipeline/schema/**" + when: + path: + # related config files + - ".woodpecker/test.yml" + # go source code + - "**/*.go" + - "go.*" + # schema changes + - "pipeline/schema/**" lint: image: golang:1.17 group: test commands: - make lint -# when: -# path: -# # related config files -# - ".woodpecker/test.yml" -# - ".golangci.yml" -# # go source code -# - "**/*.go" -# - "go.*" + when: + path: + # related config files + - ".woodpecker/test.yml" + - ".golangci.yml" + # go source code + - "**/*.go" + - "go.*" test: image: golang:1.17 @@ -44,15 +44,15 @@ pipeline: - make test-server - make test-cli - make test-lib -# when: -# path: -# # related config files -# - ".woodpecker/test.yml" -# # go source code -# - "**/*.go" -# - "go.*" -# # schema changes -# - "pipeline/schema/**" + when: + path: + # related config files + - ".woodpecker/test.yml" + # go source code + - "**/*.go" + - "go.*" + # schema changes + - "pipeline/schema/**" sqlite: image: golang:1.17 @@ -61,13 +61,13 @@ pipeline: - WOODPECKER_DATABASE_DRIVER=sqlite3 commands: - make test-server-datastore-coverage -# when: -# path: -# # related config files -# - ".woodpecker/test.yml" -# # go source code -# - "**/*.go" -# - "go.*" + when: + path: + # related config files + - ".woodpecker/test.yml" + # go source code + - "**/*.go" + - "go.*" postgres: image: golang:1.17 @@ -77,13 +77,13 @@ pipeline: - WOODPECKER_DATABASE_DATASOURCE=host=service-postgres user=postgres dbname=postgres sslmode=disable commands: - make test-server-datastore -# when: -# path: -# # related config files -# - ".woodpecker/test.yml" -# # go source code -# - "**/*.go" -# - "go.*" + when: + path: + # related config files + - ".woodpecker/test.yml" + # go source code + - "**/*.go" + - "go.*" mysql: image: golang:1.17 @@ -93,13 +93,13 @@ pipeline: - WOODPECKER_DATABASE_DATASOURCE=root@tcp(service-mysql:3306)/test?parseTime=true commands: - make test-server-datastore -# when: -# path: -# # related config files -# - ".woodpecker/test.yml" -# # go source code -# - "**/*.go" -# - "go.*" + when: + path: + # related config files + - ".woodpecker/test.yml" + # go source code + - "**/*.go" + - "go.*" codecov: pull: true @@ -112,15 +112,15 @@ pipeline: - datastore-coverage.out token: from_secret: codecov_token -# when: -# path: -# # related config files -# - ".woodpecker/test.yml" -# # go source code -# - "**/*.go" -# - "go.*" -# # schema changes -# - "pipeline/schema/**" + when: + path: + # related config files + - ".woodpecker/test.yml" + # go source code + - "**/*.go" + - "go.*" + # schema changes + - "pipeline/schema/**" services: service-postgres: @@ -129,13 +129,13 @@ services: environment: - POSTGRES_USER=postgres - POSTGRES_HOST_AUTH_METHOD=trust -# when: -# path: -# # related config files -# - ".woodpecker/test.yml" -# # go source code -# - "**/*.go" -# - "go.*" + when: + path: + # related config files + - ".woodpecker/test.yml" + # go source code + - "**/*.go" + - "go.*" service-mysql: image: mysql:5.6.27 @@ -143,10 +143,10 @@ services: environment: - MYSQL_DATABASE=test - MYSQL_ALLOW_EMPTY_PASSWORD=yes -# when: -# path: -# # related config files -# - ".woodpecker/test.yml" -# # go source code -# - "**/*.go" -# - "go.*" + when: + path: + # related config files + - ".woodpecker/test.yml" + # go source code + - "**/*.go" + - "go.*" diff --git a/.woodpecker/web.yml b/.woodpecker/web.yml index cbf8f96f6..3f29479a2 100644 --- a/.woodpecker/web.yml +++ b/.woodpecker/web.yml @@ -4,8 +4,8 @@ pipeline: commands: - cd web/ - yarn install --frozen-lockfile -# when: -# path: "web/**" + when: + path: "web/**" lint: group: test @@ -13,8 +13,8 @@ pipeline: commands: - cd web/ - yarn lint -# when: -# path: "web/**" + when: + path: "web/**" formatcheck: group: test @@ -22,8 +22,8 @@ pipeline: commands: - cd web/ - yarn formatcheck -# when: -# path: "web/**" + when: + path: "web/**" typecheck: group: test @@ -31,8 +31,8 @@ pipeline: commands: - cd web/ - yarn typecheck -# when: -# path: "web/**" + when: + path: "web/**" test: group: test @@ -40,6 +40,6 @@ pipeline: commands: - cd web/ - yarn test -# when: -# path: "web/**" + when: + path: "web/**"