From 3d8a064bed18f91f4c45710e6d353a2576d4bc95 Mon Sep 17 00:00:00 2001 From: SeaswimmerTheFsh Date: Sun, 7 Jan 2024 11:48:53 +0000 Subject: [PATCH 1/3] feat(workflow): use custom docker image for faster builds --- .forgejo/workflows/workflow.yaml | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/.forgejo/workflows/workflow.yaml b/.forgejo/workflows/workflow.yaml index 50307ad..95d1b8c 100644 --- a/.forgejo/workflows/workflow.yaml +++ b/.forgejo/workflows/workflow.yaml @@ -8,33 +8,12 @@ on: jobs: build and lint: runs-on: docker - container: catthehacker/ubuntu:act-latest + container: coastalcommits.com/seaswimmerthefsh/actionscontainers-seacogs:latest steps: - name: Checkout uses: actions/checkout@v3 with: fetch-depth: 0 - - name: Install apt packages - run: | - apt-get update - apt-get install -y \ - libcairo2-dev \ - libfreetype6-dev \ - libffi-dev \ - libjpeg-dev \ - libpng-dev \ - libz-dev \ - pngquant - - name: Setup Node - uses: actions/setup-node@v1 - with: - node-version: "12" - - name: Setup Python - uses: actions/setup-python@v4 - with: - python-version: "3.11" - - name: Install Poetry - run: curl -sSL https://cdn.seaswimmer.cc/go/poetry | python3.11 - - name: Install dependencies run: | export PATH="$HOME/.local/bin:$PATH" @@ -54,11 +33,12 @@ jobs: unset GITHUB_TOKEN unset GITLAB_TOKEN + echo "${{ github.ref_name }}" + echo "${{ github.base_ref }}" + if [ -n "${{ github.base_ref }}" ]; then - echo "${{ github.base_ref }}" release="$(basename "${{ github.base_ref }}")" else - echo "${{ github.ref_name }}" release="$(basename "${{ github.ref_name }}")" fi From fcf369387cfb761f01a0a68f150bc134a41c034a Mon Sep 17 00:00:00 2001 From: SeaswimmerTheFsh Date: Sun, 7 Jan 2024 11:53:35 +0000 Subject: [PATCH 2/3] fix(workflow): removed some useless lines --- .forgejo/workflows/workflow.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.forgejo/workflows/workflow.yaml b/.forgejo/workflows/workflow.yaml index 95d1b8c..56c3887 100644 --- a/.forgejo/workflows/workflow.yaml +++ b/.forgejo/workflows/workflow.yaml @@ -16,12 +16,9 @@ jobs: fetch-depth: 0 - name: Install dependencies run: | - export PATH="$HOME/.local/bin:$PATH" - poetry config virtualenvs.create false poetry install --with docs --with dev --no-root - name: Build the documentation run: | - export PATH="$HOME/.local/bin:$PATH" mkdocs build continue-on-error: true - name: Deploy the documentation to Meli (CoastalCommits Pages) From c0f076add045d689780f6eee5f09eb1fee222504 Mon Sep 17 00:00:00 2001 From: SeaswimmerTheFsh Date: Sun, 7 Jan 2024 12:17:40 +0000 Subject: [PATCH 3/3] misc(workflow): simplifying the workflow now that deps are installed in the container --- .forgejo/workflows/workflow.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.forgejo/workflows/workflow.yaml b/.forgejo/workflows/workflow.yaml index 56c3887..cdc5512 100644 --- a/.forgejo/workflows/workflow.yaml +++ b/.forgejo/workflows/workflow.yaml @@ -54,5 +54,4 @@ jobs: continue-on-error: true - name: Analysing the code with Pylint run: | - export PATH="$HOME/.local/bin:$PATH" - poetry run pylint --rcfile .forgejo/workflows/config/.pylintrc $(git ls-files '*.py') + pylint --rcfile .forgejo/workflows/config/.pylintrc $(git ls-files '*.py')