From e06cacb29ade36ccf22ed5d58a5314eb23335d7a Mon Sep 17 00:00:00 2001 From: Hans van Luttikhuizen-Ross Date: Wed, 26 Jun 2024 21:33:35 +0200 Subject: [PATCH] Update GitHub workflow --- .github/workflows/hugo.yaml | 60 +++++++++++++------------------------ .idea/yamllint.xml | 7 +++++ 2 files changed, 28 insertions(+), 39 deletions(-) create mode 100644 .idea/yamllint.xml diff --git a/.github/workflows/hugo.yaml b/.github/workflows/hugo.yaml index 5c42279..975395b 100644 --- a/.github/workflows/hugo.yaml +++ b/.github/workflows/hugo.yaml @@ -5,7 +5,6 @@ on: branches: - main - # Enables running this workflow manually from the Actions tab workflow_dispatch: permissions: @@ -13,57 +12,42 @@ permissions: pages: write id-token: write -# Allow only one concurrent deployment, skipping runs queued between the run -# in-progress and latest queued. However, do NOT cancel in-progress runs as we -# want to allow these production deployments to complete. concurrency: group: "pages" cancel-in-progress: false -# Default to bash -defaults: - run: - shell: bash - jobs: - # Build job build: runs-on: ubuntu-latest - env: - HUGO_VERSION: 0.119.0 steps: - - name: Install Hugo CLI - run: | - wget -O ${{ runner.temp }}/hugo.deb https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_linux-amd64.deb \ - && sudo dpkg -i ${{ runner.temp }}/hugo.deb - - name: Install Dart Sass - run: sudo snap install dart-sass - - name: Checkout - uses: actions/checkout@v3 + - uses: actions/configure-pages@v4 + id: pages + + - uses: actions/checkout@v4 with: - submodules: recursive fetch-depth: 0 - - name: Setup Pages - id: pages - uses: actions/configure-pages@v3 - - name: Install Node.js dependencies - run: "[[ -f package-lock.json || -f npm-shrinkwrap.json ]] && npm ci || true" - - name: Build with Hugo - env: - # For maximum backward compatibility with Hugo modules - HUGO_ENVIRONMENT: production - HUGO_ENV: production - run: | + + - uses: peaceiris/actions-hugo@v3 + with: + hugo-version: 'latest' + extended: true + + - uses: oven-sh/setup-bun@v1 + with: + bun-version: latest + + - run: bun install --frozen-lockfile + + - run: | hugo \ --gc \ --minify \ - --baseURL "${{ steps.pages.outputs.base_url }}/" - - name: Upload artifact - uses: actions/upload-pages-artifact@v2 + --baseURL ${{ steps.pages.outputs.base_url }} + + - uses: actions/upload-pages-artifact@v3 with: path: ./public - # Deployment job deploy: environment: name: github-pages @@ -71,6 +55,4 @@ jobs: runs-on: ubuntu-latest needs: build steps: - - name: Deploy to GitHub Pages - id: deployment - uses: actions/deploy-pages@v2 + - uses: actions/deploy-pages@v4 diff --git a/.idea/yamllint.xml b/.idea/yamllint.xml new file mode 100644 index 0000000..735a954 --- /dev/null +++ b/.idea/yamllint.xml @@ -0,0 +1,7 @@ + + + + true + /opt/homebrew/bin/yamllint + + \ No newline at end of file