From 554d9bccc4f1fb4a3c8768008fef01d3c39fc4cb Mon Sep 17 00:00:00 2001 From: Melora Hugues Date: Sun, 22 Oct 2023 11:10:23 +0200 Subject: [PATCH 1/3] chore: drop drone support --- .drone.yml | 88 ------------------------------------------------------ README.md | 2 +- 2 files changed, 1 insertion(+), 89 deletions(-) delete mode 100644 .drone.yml diff --git a/.drone.yml b/.drone.yml deleted file mode 100644 index da2334a..0000000 --- a/.drone.yml +++ /dev/null @@ -1,88 +0,0 @@ ---- -# Test building the code and docker image -kind: pipeline -type: docker -name: test-build - -steps: - - name: go-test - image: golang - commands: - - make -C polyculeconnect test - depends_on: - - - name: go-build - image: golang - commands: - - make -C polyculeconnect build - depends_on: - - - name: docker-build-only - image: thegeeklab/drone-docker-buildx - privileged: true - settings: - repo: git.faercol.me/polyculeconnect/polyculeconnect - tags: latest - dry_run: true - platforms: - - linux/amd64 - # - linux/arm64 - depends_on: - when: - branch: - exclude: - - main - - - name: docker-build-push - image: thegeeklab/drone-docker-buildx - privileged: true - settings: - repo: git.faercol.me/polyculeconnect/polyculeconnect - registry: git.faercol.me - tags: latest - username: - from_secret: GIT_USERNAME - password: - from_secret: GIT_PASSWORD - platforms: - - linux/amd64 - # - linux/arm64 - depends_on: - - go-test - - go-build - when: - branch: - - main - -trigger: - event: - - push - - tag - ---- -# On a tag, only build the related docker image -kind: pipeline -type: docker -name: tag-release -depends_on: - - test-build - -steps: - - name: docker-push-tag - image: thegeeklab/drone-docker-buildx - privileged: true - settings: - registry: git.faercol.me - repo: git.faercol.me/polyculeconnect/polyculeconnect - auto_tag: true - platforms: - - linux/amd64 - # - linux/arm64 - username: - from_secret: GIT_USERNAME - password: - from_secret: GIT_PASSWORD - -trigger: - event: - - tag diff --git a/README.md b/README.md index a3981e7..68f0ad8 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # PolyculeConnect -[![Build Status](https://drone.faercol.me/api/badges/PolyculeConnect/polycule-connect/status.svg)](https://drone.faercol.me/PolyculeConnect/polycule-connect) +[![status-badge](https://ci-polycule-connect.chapoline.me/api/badges/1/status.svg)](https://ci-polycule-connect.chapoline.me/repos/1) ![Project logo](./polyculeconnect/static/img/logo-text.png) -- 2.45.2 From a82c12fc9337fb6e710f1f219cc410db42b2a4ac Mon Sep 17 00:00:00 2001 From: Melora Hugues Date: Sun, 22 Oct 2023 14:03:56 +0200 Subject: [PATCH 2/3] chore: add vscode to gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 83a83a5..3c98e4d 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,5 @@ go.work # Go build file **/build/ + +.vscode \ No newline at end of file -- 2.45.2 From e00347d96f669ef9aa43c8e6f4b2c10719738190 Mon Sep 17 00:00:00 2001 From: Melora Hugues Date: Sun, 22 Oct 2023 11:12:49 +0200 Subject: [PATCH 3/3] fix: correct ci definition for woodpecker --- .woodpecker.yml | 88 ------------------------------------------ .woodpecker/deploy.yml | 57 +++++++++++++++++++++++++++ .woodpecker/test.yml | 13 +++++++ 3 files changed, 70 insertions(+), 88 deletions(-) delete mode 100644 .woodpecker.yml create mode 100644 .woodpecker/deploy.yml create mode 100644 .woodpecker/test.yml diff --git a/.woodpecker.yml b/.woodpecker.yml deleted file mode 100644 index e158a21..0000000 --- a/.woodpecker.yml +++ /dev/null @@ -1,88 +0,0 @@ ---- -# Test building the code and docker image -kind: pipeline -type: docker -name: test-build - -steps: - - name: go-test - image: golang - commands: - - make -C polyculeconnect test - depends_on: - - - name: go-build - image: golang - commands: - - make -C polyculeconnect build - depends_on: - - - name: docker-build-only - image: thegeeklab/drone-docker-buildx - privileged: true - settings: - repo: git.faercol.me/polyculeconnect/polyculeconnect - tags: latest - dry_run: true - platforms: - - linux/amd64 - # - linux/arm64 - depends_on: - when: - branch: - exclude: - - main - - - name: docker-build-push - image: thegeeklab/drone-docker-buildx - privileged: true - settings: - repo: git.faercol.me/polyculeconnect/polyculeconnect - registry: git.faercol.me - tags: latest - username: - from_secret: GIT_USERNAME - password: - from_secret: GIT_PASSWORD - platforms: - - linux/amd64 - # - linux/arm64 - depends_on: - - go-test - - go-build - when: - branch: - - main - -trigger: - event: - - push - - tag - ---- -# On a tag, only build the related docker image -kind: pipeline -type: docker -name: tag-release -depends_on: - - test-build - -steps: - - name: docker-push-tag - image: thegeeklab/drone-docker-buildx - privileged: true - settings: - registry: git.faercol.me - repo: git.faercol.me/polyculeconnect/polyculeconnect - auto_tag: true - platforms: - - linux/amd64 - # - linux/arm64 - username: - from_secret: GIT_USERNAME - password: - from_secret: GIT_PASSWORD - -trigger: - event: - - tag \ No newline at end of file diff --git a/.woodpecker/deploy.yml b/.woodpecker/deploy.yml new file mode 100644 index 0000000..36f5034 --- /dev/null +++ b/.woodpecker/deploy.yml @@ -0,0 +1,57 @@ +steps: + docker-build-only: + image: woodpeckerci/plugin-docker-buildx + privileged: true + settings: + repo: git.faercol.me/polyculeconnect/polyculeconnect + tags: latest + dry_run: true + platforms: + - linux/amd64 + # - linux/arm64 + when: + - event: pull_request + - event: push + branch: + exclude: [main] + + docker-build-push: + image: woodpeckerci/plugin-docker-buildx + privileged: true + settings: + repo: git.faercol.me/polyculeconnect/polyculeconnect + registry: git.faercol.me + tags: latest + username: + from_secret: git_username + password: + from_secret: git_password + platforms: + - linux/amd64 + # - linux/arm64 + when: + - event: push + branch: main + + docker-push-tag: + image: woodpeckerci/plugin-docker-buildx + privileged: true + settings: + registry: git.faercol.me + repo: git.faercol.me/polyculeconnect/polyculeconnect + auto_tag: true + platforms: + - linux/amd64 + # - linux/arm64 + username: + from_secret: git_username + password: + from_secret: git_password + when: + - event: tag + +depends_on: + - test + +when: + event: [push, tag] diff --git a/.woodpecker/test.yml b/.woodpecker/test.yml new file mode 100644 index 0000000..be910ab --- /dev/null +++ b/.woodpecker/test.yml @@ -0,0 +1,13 @@ +steps: + go-test: + image: golang + commands: + - make -C polyculeconnect test + + go-build: + image: golang + commands: + - make -C polyculeconnect build + +when: + event: [push, tag] -- 2.45.2