From d5f2af35b0b3376691cf84fe5a352cfcd0a717da Mon Sep 17 00:00:00 2001 From: Alicia Sykes Date: Wed, 11 Mar 2026 11:34:06 +0000 Subject: [PATCH] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20Improve=20dev=20container?= =?UTF-8?q?=20and=20workflow=20configs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .devcontainer/devcontainer.json | 18 ++++++------ .github/workflows/bump-and-tag.yml | 11 ++++++-- .github/workflows/mirror.yml | 15 ++++++---- .github/workflows/pr-quality-check.yml | 39 +++++++++++++------------- .github/workflows/update-docs-site.yml | 4 +-- .github/workflows/wiki-sync.yml | 13 ++------- 6 files changed, 50 insertions(+), 50 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index eb1e6c02..96b1e1bc 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -3,16 +3,17 @@ { "name": "Dashy", // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile - "image": "mcr.microsoft.com/devcontainers/javascript-node:1-18-bullseye", + "image": "mcr.microsoft.com/devcontainers/javascript-node:1-24-bookworm", "customizations": { "vscode": { "extensions": [ "Vue.volar", "dbaeumer.vscode-eslint", "ms-azuretools.vscode-docker", - "ms-edgedevtools.vscode-edge-devtools", - "firefox-devtools.vscode-firefox-debug", - "aaravb.chrome-extension-developer-tools" + "EditorConfig.EditorConfig", + "esbenp.prettier-vscode", + "vitest.explorer", + "redhat.vscode-yaml" ] } }, @@ -22,14 +23,11 @@ "ghcr.io/devcontainers/features/github-cli:1": {} }, - // Use 'forwardPorts' to make a list of ports inside the container available locally. - // "forwardPorts": [], + // Make the dev server and production server ports available locally. + "forwardPorts": [8080, 4000], // Use 'postCreateCommand' to run commands after the container is created. - "postCreateCommand": "yarn install --ignore-engines --immutable --no-cache --network-timeout 300000 --network-concurrency 1" - - // Configure tool-specific properties. - // "customizations": {}, + "postCreateCommand": "yarn install --ignore-engines --network-timeout 300000" // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root. // "remoteUser": "root" diff --git a/.github/workflows/bump-and-tag.yml b/.github/workflows/bump-and-tag.yml index e0ab2f3e..9ed73656 100644 --- a/.github/workflows/bump-and-tag.yml +++ b/.github/workflows/bump-and-tag.yml @@ -14,7 +14,7 @@ concurrency: cancel-in-progress: false permissions: - contents: read + contents: write pull-requests: read jobs: @@ -104,5 +104,12 @@ jobs: echo "Tag $VERSION already exists, skipping" exit 0 fi - git tag -a "$VERSION" -m "Release v$VERSION" + + printf 'Published Dashy v%s 🚀\n\nPR #%s: %s\nMerge commit: %s\n' \ + "$VERSION" \ + "$PR_NUMBER" \ + "$PR_TITLE" \ + "$MERGE_SHA" > tag-message.txt + + git tag -a "$VERSION" -F tag-message.txt git push origin "$VERSION" diff --git a/.github/workflows/mirror.yml b/.github/workflows/mirror.yml index 3918b8a9..65f2072a 100644 --- a/.github/workflows/mirror.yml +++ b/.github/workflows/mirror.yml @@ -1,4 +1,6 @@ -# Pushes the contents of the repo to the Codeberg mirror +# Syncs the full source of the Dashy repo over to our Codeberg mirror +# For all you non-Microsoft babes! +# This is then accessible over at https://codeberg.org/alicia/dashy name: 🪞 Mirror to Codeberg on: workflow_dispatch: @@ -8,9 +10,10 @@ jobs: codeberg: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - with: { fetch-depth: 0 } - - uses: pixta-dev/repository-mirroring-action@v1 + - uses: lissy93/repo-mirror-action@v1.5.0 with: - target_repo_url: git@codeberg.org:alicia/dashy.git - ssh_private_key: ${{ secrets.CODEBERG_SSH }} + ssh_key: ${{ secrets.CODEBERG_SSH }} + host: git@codeberg.org + user: alicia + repo: dashy + force_push: false diff --git a/.github/workflows/pr-quality-check.yml b/.github/workflows/pr-quality-check.yml index 61c52392..e8a173ea 100644 --- a/.github/workflows/pr-quality-check.yml +++ b/.github/workflows/pr-quality-check.yml @@ -94,22 +94,23 @@ jobs: run: sh tests/docker-smoke-test.sh timeout-minutes: 10 - security: - name: 🔒 Security Audit - runs-on: ubuntu-latest - continue-on-error: true - steps: - - name: 🛎️ Checkout Code - uses: actions/checkout@v4 - - - name: 🔧 Setup Node.js - uses: actions/setup-node@v4 - with: - node-version: '20' - cache: 'yarn' - - - name: 📦 Install Dependencies - run: yarn install --frozen-lockfile - - - name: 🔒 Run Security Audit - run: yarn audit --level high + # TODO: Re-enable security audit job + # security: + # name: 🔒 Security Audit + # runs-on: ubuntu-latest + # continue-on-error: true + # steps: + # - name: 🛎️ Checkout Code + # uses: actions/checkout@v4 + # + # - name: 🔧 Setup Node.js + # uses: actions/setup-node@v4 + # with: + # node-version: '20' + # cache: 'yarn' + # + # - name: 📦 Install Dependencies + # run: yarn install --frozen-lockfile + # + # - name: 🔒 Run Security Audit + # run: yarn audit --level high diff --git a/.github/workflows/update-docs-site.yml b/.github/workflows/update-docs-site.yml index 7964bf38..4ee484d6 100644 --- a/.github/workflows/update-docs-site.yml +++ b/.github/workflows/update-docs-site.yml @@ -46,7 +46,7 @@ jobs: - name: Setup Node.js 🟢 uses: actions/setup-node@v4 with: - node-version: '18' + node-version: '22' - name: Install website dependencies 📦 working-directory: website-docs @@ -59,7 +59,7 @@ jobs: run: | cp -r ../master-docs/docs ./ python ./do-doc-updaty-magic.py - + - name: Commit changes 🚀 run: | cd website-docs diff --git a/.github/workflows/wiki-sync.yml b/.github/workflows/wiki-sync.yml index 6825ef3a..f812712b 100644 --- a/.github/workflows/wiki-sync.yml +++ b/.github/workflows/wiki-sync.yml @@ -9,9 +9,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@master + uses: actions/checkout@v4 - name: Upload Docs to GH Wiki - uses: docker://decathlon/wiki-page-creator-action:latest + uses: docker://decathlon/wiki-page-creator-action:2.0.3 env: GH_PAT: ${{ secrets.BOT_GITHUB_TOKEN || secrets.GITHUB_TOKEN }} ACTION_MAIL: alicia-gh-bot@mail.as93.net @@ -19,12 +19,3 @@ jobs: OWNER: Lissy93 REPO_NAME: Dashy MD_FOLDER: docs/ -# - name: Sync Wiki -# uses: joeizzard/action-wiki-sync@master -# with: -# username: example -# access_token: ${{ secrets.GITHUB_TOKEN }} -# wiki_folder: ./docs -# commit_username: 'liss-bot' -# commit_email: 'liss-bot@d0h.co' -# commit_message: '📕 Chore: Sync Wiki'