From 35f9babbcaf1098529a73c4a15513ae9850f7af2 Mon Sep 17 00:00:00 2001 From: "Luke W. Johnston" Date: Wed, 13 Nov 2024 15:02:22 +0100 Subject: [PATCH 1/6] ci: :fire: remove commented out Django workflow --- .github/workflows/deploy-demo.yml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/.github/workflows/deploy-demo.yml b/.github/workflows/deploy-demo.yml index 3372eac..ef90c65 100644 --- a/.github/workflows/deploy-demo.yml +++ b/.github/workflows/deploy-demo.yml @@ -27,18 +27,3 @@ jobs: test: uses: seedcase-project/.github/.github/workflows/test.yml@main needs: lint - - # deploy: - # name: Deploy app - # runs-on: ubuntu-latest - # needs: test - - # concurrency: deploy-group # optional: ensure only one action runs at a time - # steps: - # - uses: actions/checkout@v4 - - # - name: Deploy to Fly.io - # uses: superfly/flyctl-actions/setup-flyctl@master - # - run: flyctl deploy --remote-only - # env: - # FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }} From 69e11ac7cecbded1b78809700b1655937f4fe983 Mon Sep 17 00:00:00 2001 From: "Luke W. Johnston" Date: Wed, 13 Nov 2024 15:03:13 +0100 Subject: [PATCH 2/6] ci: :truck: update path to reusable workflows --- .github/workflows/deploy-demo.yml | 4 ++-- .github/workflows/puml-to-svg.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy-demo.yml b/.github/workflows/deploy-demo.yml index ef90c65..63fe40f 100644 --- a/.github/workflows/deploy-demo.yml +++ b/.github/workflows/deploy-demo.yml @@ -22,8 +22,8 @@ on: jobs: lint: - uses: seedcase-project/.github/.github/workflows/lint-python.yml@main + uses: seedcase-project/.github/.github/workflows/reusable-lint-python.yml@main test: - uses: seedcase-project/.github/.github/workflows/test.yml@main + uses: seedcase-project/.github/.github/workflows/reusable-test-python.yml@main needs: lint diff --git a/.github/workflows/puml-to-svg.yml b/.github/workflows/puml-to-svg.yml index 3af76cc..3a2b8c9 100644 --- a/.github/workflows/puml-to-svg.yml +++ b/.github/workflows/puml-to-svg.yml @@ -7,6 +7,6 @@ on: jobs: generate-plantuml: - uses: seedcase-project/.github/.github/workflows/puml-to-svg.yml@main + uses: seedcase-project/.github/.github/workflows/reusable-puml-to-svg.yml@main secrets: github-token: ${{ secrets.GITHUB_TOKEN }} From 8fbc7f06f6189fe5931301436e186edb497440a7 Mon Sep 17 00:00:00 2001 From: "Luke W. Johnston" Date: Wed, 13 Nov 2024 15:04:09 +0100 Subject: [PATCH 3/6] ci: :construction_worker: always run on main, but only in PRs with specific files --- .github/workflows/deploy-demo.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy-demo.yml b/.github/workflows/deploy-demo.yml index 63fe40f..a35456e 100644 --- a/.github/workflows/deploy-demo.yml +++ b/.github/workflows/deploy-demo.yml @@ -1,7 +1,7 @@ name: Deploy Demo App on: - push: + pull_request: branches: - main paths-ignore: @@ -19,6 +19,9 @@ on: - index.qmd - _publish.yml - _extensions/** + push: + branches: + - main jobs: lint: From 0fb318bd6776e15b6372edff1019ea15493c943f Mon Sep 17 00:00:00 2001 From: "Luke W. Johnston" Date: Wed, 13 Nov 2024 15:04:44 +0100 Subject: [PATCH 4/6] ci: :memo: update text of some fields --- .github/workflows/deploy-demo.yml | 2 +- .github/workflows/deploy-docs.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy-demo.yml b/.github/workflows/deploy-demo.yml index a35456e..3777628 100644 --- a/.github/workflows/deploy-demo.yml +++ b/.github/workflows/deploy-demo.yml @@ -1,4 +1,4 @@ -name: Deploy Demo App +name: Build package on: pull_request: diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml index 4001fa7..f6f4e9c 100644 --- a/.github/workflows/deploy-docs.yml +++ b/.github/workflows/deploy-docs.yml @@ -1,4 +1,4 @@ -name: Deploy documentation as website +name: Build website of documentation on: push: @@ -12,7 +12,7 @@ on: - _extensions/** jobs: - build-deploy-docs: - uses: seedcase-project/.github/.github/workflows/deploy-docs-with-python.yml@main + build-website: + uses: seedcase-project/.github/.github/workflows/reusable-build-docs-with-python.yml@main secrets: netlify-token: ${{ secrets.NETLIFY_AUTH_TOKEN }} From b03cb6e23e6abce7d2991b80589a0195b4071cbd Mon Sep 17 00:00:00 2001 From: "Luke W. Johnston" Date: Wed, 13 Nov 2024 15:05:05 +0100 Subject: [PATCH 5/6] ci: :fire: no longer need this file, not pushing to Fly --- .github/workflows/deploy-pr-preview.yml | 65 ------------------------- 1 file changed, 65 deletions(-) delete mode 100644 .github/workflows/deploy-pr-preview.yml diff --git a/.github/workflows/deploy-pr-preview.yml b/.github/workflows/deploy-pr-preview.yml deleted file mode 100644 index 02a497d..0000000 --- a/.github/workflows/deploy-pr-preview.yml +++ /dev/null @@ -1,65 +0,0 @@ -# From: https://github.com/superfly/fly-pr-review-apps -name: Deploy PR Preview App - -on: - pull_request: - types: [opened, reopened, synchronize] - branches: - - main - paths-ignore: - # Config files - - ".github/**" - - ".vscode/**" - - ".gitignore" - # Documentation - - "docs/**" - - "*.md" - - "*.qmd" - - "justfile" - # Website files - - _quarto.yml - - index.qmd - - _publish.yml - - _extensions/** - -# env: -# FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }} -# FLY_REGION: ams -# FLY_ORG: seedcase-project - -jobs: - lint: - uses: seedcase-project/.github/.github/workflows/lint-python.yml@main - - test: - uses: seedcase-project/.github/.github/workflows/test.yml@main - needs: lint - - # staging-app: - # runs-on: ubuntu-latest - # needs: test - - # # Only run one deployment at a time per PR. - # concurrency: - # group: pr-${{ github.event.number }} - - # # Create a GitHub deployment environment per staging app so it shows up - # # in the pull request UI. - # environment: - # name: pr-${{ github.event.number }} - # url: ${{ steps.deploy.outputs.url }} - - # steps: - # - uses: actions/checkout@v4 - - # # Need to install direct from source, since their action is outdated - # - name: Install Fly CLI - # run: | - # curl -L https://fly.io/install.sh | sh - # echo "/home/runner/.fly/bin" >> $GITHUB_PATH - - # - name: Deploy preview of PR - # id: deploy - # uses: ... - # with: - # name: ${{ github.event.repository.name }}-pr-${{ github.event.number }} From 66acef9f1a48323c026c92121bc864c7f9501444 Mon Sep 17 00:00:00 2001 From: "Luke W. Johnston" Date: Wed, 13 Nov 2024 15:05:45 +0100 Subject: [PATCH 6/6] ci: :truck: rename workflows to be clearer and simpler --- .github/workflows/{deploy-demo.yml => build-package.yml} | 0 .github/workflows/{deploy-docs.yml => build-website.yml} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{deploy-demo.yml => build-package.yml} (100%) rename .github/workflows/{deploy-docs.yml => build-website.yml} (100%) diff --git a/.github/workflows/deploy-demo.yml b/.github/workflows/build-package.yml similarity index 100% rename from .github/workflows/deploy-demo.yml rename to .github/workflows/build-package.yml diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/build-website.yml similarity index 100% rename from .github/workflows/deploy-docs.yml rename to .github/workflows/build-website.yml