From 1ec7e3ec9c118fcf797e9eb757276f5b5ac1bfe6 Mon Sep 17 00:00:00 2001 From: Francois Bonneau Date: Thu, 28 Jul 2022 16:37:09 +0200 Subject: [PATCH 1/8] fix(CICD): use personal version. BREAKING CHANGE: remove notifications --- .github/workflows/CD.yml | 21 ++++----------------- .github/workflows/CI.yml | 15 +++++---------- 2 files changed, 9 insertions(+), 27 deletions(-) diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml index 2c349fc..5637acb 100644 --- a/.github/workflows/CD.yml +++ b/.github/workflows/CD.yml @@ -6,46 +6,33 @@ on: jobs: release-linux: - uses: Geode-solutions/actions/.github/workflows/cd-linux.yml@master + uses: francoisbonneau/actions/.github/workflows/cd-linux.yml@master with: name: OPENGEODE_MYMODULE repos: OpenGeode secrets: TOKEN: ${{ secrets.TOKEN }} - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} release-linux-python: - uses: Geode-solutions/actions/.github/workflows/cd-linux-python.yml@master + uses: francoisbonneau/actions/.github/workflows/cd-linux-python.yml@master with: name: OPENGEODE_MYMODULE repos: OpenGeode secrets: TOKEN: ${{ secrets.TOKEN }} - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} - PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }} release-windows: - uses: Geode-solutions/actions/.github/workflows/cd-windows.yml@master + uses: francoisbonneau/actions/.github/workflows/cd-windows.yml@master with: name: OPENGEODE_MYMODULE repos: OpenGeode secrets: TOKEN: ${{ secrets.TOKEN }} - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} release-windows-python: - uses: Geode-solutions/actions/.github/workflows/cd-windows-python.yml@master + uses: francoisbonneau/actions/.github/workflows/cd-windows-python.yml@master with: name: OPENGEODE_MYMODULE repos: OpenGeode secrets: TOKEN: ${{ secrets.TOKEN }} - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} - PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }} - - notify: - uses: Geode-solutions/actions/.github/workflows/end-cd.yml@master - needs: [release-linux, release-linux-python, release-windows, release-windows-python] - secrets: - TOKEN: ${{ secrets.TOKEN }} - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index d182b2f..1a41293 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -3,46 +3,41 @@ name: CI on: push: pull_request: - schedule: - - cron: 0 0 * * * jobs: format: - uses: Geode-solutions/actions/.github/workflows/format.yml@master + uses: francoisbonneau/actions/.github/workflows/format.yml@master secrets: TOKEN: ${{ secrets.TOKEN }} build-linux: needs: format - uses: Geode-solutions/actions/.github/workflows/ci-linux.yml@master + uses: francoisbonneau/actions/.github/workflows/ci-linux.yml@master with: repos: OpenGeode secrets: TOKEN: ${{ secrets.TOKEN }} - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} build-linux-python: needs: format - uses: Geode-solutions/actions/.github/workflows/ci-linux-python.yml@master + uses: francoisbonneau/actions/.github/workflows/ci-linux-python.yml@master with: name: OPENGEODE_MYMODULE repos: OpenGeode secrets: TOKEN: ${{ secrets.TOKEN }} - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} build-windows: needs: format - uses: Geode-solutions/actions/.github/workflows/ci-windows.yml@master + uses: francoisbonneau/actions/.github/workflows/ci-windows.yml@master with: name: OPENGEODE_MYMODULE repos: OpenGeode secrets: TOKEN: ${{ secrets.TOKEN }} - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} semantic-release: needs: [build-linux, build-linux-python, build-windows] - uses: Geode-solutions/actions/.github/workflows/release.yml@master + uses: francoisbonneau/actions/.github/workflows/release.yml@master secrets: TOKEN: ${{ secrets.TOKEN }} From 28b97d4c608bddaf1e430b8c2623778cfa92e4e9 Mon Sep 17 00:00:00 2001 From: Francois Bonneau Date: Thu, 28 Jul 2022 16:45:34 +0200 Subject: [PATCH 2/8] Update CI.yml --- .github/workflows/CI.yml | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 1a41293..4f70ddf 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -10,34 +10,3 @@ jobs: secrets: TOKEN: ${{ secrets.TOKEN }} - build-linux: - needs: format - uses: francoisbonneau/actions/.github/workflows/ci-linux.yml@master - with: - repos: OpenGeode - secrets: - TOKEN: ${{ secrets.TOKEN }} - - build-linux-python: - needs: format - uses: francoisbonneau/actions/.github/workflows/ci-linux-python.yml@master - with: - name: OPENGEODE_MYMODULE - repos: OpenGeode - secrets: - TOKEN: ${{ secrets.TOKEN }} - - build-windows: - needs: format - uses: francoisbonneau/actions/.github/workflows/ci-windows.yml@master - with: - name: OPENGEODE_MYMODULE - repos: OpenGeode - secrets: - TOKEN: ${{ secrets.TOKEN }} - - semantic-release: - needs: [build-linux, build-linux-python, build-windows] - uses: francoisbonneau/actions/.github/workflows/release.yml@master - secrets: - TOKEN: ${{ secrets.TOKEN }} From b3637b636659776775fa7cd957f2e1ce8d90cb0b Mon Sep 17 00:00:00 2001 From: Francois Bonneau Date: Tue, 2 Aug 2022 10:58:15 +0200 Subject: [PATCH 3/8] Update CI.yml tes --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 4f70ddf..0b28a93 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -6,7 +6,7 @@ on: jobs: format: - uses: francoisbonneau/actions/.github/workflows/format.yml@master + uses: Geode-solutions/actions/.github/workflows/format.yml@master secrets: TOKEN: ${{ secrets.TOKEN }} From 7e8d3e19c0e0b3a53e0d2727e9684e9d4bf087cb Mon Sep 17 00:00:00 2001 From: Francois Bonneau Date: Tue, 2 Aug 2022 11:01:19 +0200 Subject: [PATCH 4/8] Update CI.yml --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 0b28a93..4f70ddf 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -6,7 +6,7 @@ on: jobs: format: - uses: Geode-solutions/actions/.github/workflows/format.yml@master + uses: francoisbonneau/actions/.github/workflows/format.yml@master secrets: TOKEN: ${{ secrets.TOKEN }} From 8e820d462fbf0f36989bb7bfbff5c344c463997d Mon Sep 17 00:00:00 2001 From: Francois Bonneau Date: Tue, 2 Aug 2022 12:32:29 +0200 Subject: [PATCH 5/8] Update CI.yml --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 4f70ddf..44ab884 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -6,7 +6,7 @@ on: jobs: format: - uses: francoisbonneau/actions/.github/workflows/format.yml@master + uses: actions/.github/workflows/format.yml@master secrets: TOKEN: ${{ secrets.TOKEN }} From 447064e0cf2b1468f5ac97daf5734162941bdafb Mon Sep 17 00:00:00 2001 From: Francois Bonneau Date: Tue, 2 Aug 2022 18:29:20 +0200 Subject: [PATCH 6/8] fix(ci): use my workflow --- .github/workflows/CD.yml | 8 ++++---- .github/workflows/CI.yml | 37 +++++++++++++++++++++++++++++++++++-- 2 files changed, 39 insertions(+), 6 deletions(-) diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml index 5637acb..c7a9a39 100644 --- a/.github/workflows/CD.yml +++ b/.github/workflows/CD.yml @@ -6,7 +6,7 @@ on: jobs: release-linux: - uses: francoisbonneau/actions/.github/workflows/cd-linux.yml@master + uses: francoisbonneau/my_actions/.github/workflows/opengeode_cd_linux.yml@master with: name: OPENGEODE_MYMODULE repos: OpenGeode @@ -14,7 +14,7 @@ jobs: TOKEN: ${{ secrets.TOKEN }} release-linux-python: - uses: francoisbonneau/actions/.github/workflows/cd-linux-python.yml@master + uses: francoisbonneau/my_actions/.github/workflows/opengeode_cd_linux_python.yml@master with: name: OPENGEODE_MYMODULE repos: OpenGeode @@ -22,7 +22,7 @@ jobs: TOKEN: ${{ secrets.TOKEN }} release-windows: - uses: francoisbonneau/actions/.github/workflows/cd-windows.yml@master + uses: francoisbonneau/my_actions/.github/workflows/opengeode_cd_windows.yml@master with: name: OPENGEODE_MYMODULE repos: OpenGeode @@ -30,7 +30,7 @@ jobs: TOKEN: ${{ secrets.TOKEN }} release-windows-python: - uses: francoisbonneau/actions/.github/workflows/cd-windows-python.yml@master + uses: francoisbonneau/my_actions/.github/workflows/opengeode_cd_windows_python.yml@master with: name: OPENGEODE_MYMODULE repos: OpenGeode diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 4f70ddf..f9bb537 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -4,9 +4,42 @@ on: push: pull_request: + + jobs: format: - uses: francoisbonneau/actions/.github/workflows/format.yml@master + uses: francoisbonneau/my_actions/.github/workflows/format.yml@master secrets: TOKEN: ${{ secrets.TOKEN }} - + + build-linux: + needs: format + uses: francoisbonneau/my_actions/.github/workflows/opengeode_ci_linux.yml@master + with: + repos: OpenGeode + secrets: + TOKEN: ${{ secrets.TOKEN }} + + build-linux-python: + needs: format + uses: francoisbonneau/my_actions/.github/workflows/opengeode_ci_linux_python.yml@master + with: + name: OPENGEODE_MYMODULE + repos: OpenGeode + secrets: + TOKEN: ${{ secrets.TOKEN }} + + build-windows: + needs: format + uses: francoisbonneau/my_actions/.github/workflows/opengeode_ci_windows.yml@master + with: + name: OPENGEODE_MYMODULE + repos: OpenGeode + secrets: + TOKEN: ${{ secrets.TOKEN }} + + semantic-release: + needs: [build-linux, build-linux-python, build-windows] + uses: francoisbonneau/my_actions/.github/workflows/release.yml@master + secrets: + TOKEN: ${{ secrets.TOKEN }} \ No newline at end of file From ab7eb9b965d0d96b449af18ec791646906701293 Mon Sep 17 00:00:00 2001 From: Francois Bonneau Date: Tue, 2 Aug 2022 18:32:55 +0200 Subject: [PATCH 7/8] remove license --- README.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/README.md b/README.md index 2319bef..f02bbc0 100644 --- a/README.md +++ b/README.md @@ -42,8 +42,3 @@ Have also a look at this [OpenGeode] documentation: https://docs.geode-solutions For questions and support please use the official [slack](https://slackin-opengeode.herokuapp.com) and go to the channel #module_template. The issue list of this repo is exclusively for bug reports and feature requests. -## License - -[MIT](https://opensource.org/licenses/MIT) - -Copyright (c) 2019 - 2022, Geode-solutions From 60185748daadd372f37f1a9737ab04265c41d7da Mon Sep 17 00:00:00 2001 From: Francois Bonneau Date: Tue, 2 Aug 2022 18:37:24 +0200 Subject: [PATCH 8/8] fix(ci): semantic release --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 3396bca..d359ebb 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -38,6 +38,6 @@ jobs: semantic-release: needs: [build-linux, build-linux-python, build-windows] - uses: francoisbonneau/my_actions/.github/workflows/release.yml@master + uses: francoisbonneau/my_actions/.github/workflows/semantic_release.yml@master secrets: TOKEN: ${{ secrets.TOKEN }} \ No newline at end of file