[pull] master from gohugoio:master

.circleci/config.yml

@@ -1,51 +1,115 @@
+parameters:
+
+# v2: 11m.
 defaults: &defaults
+  resource_class: large
   docker:
-      - image: bepsays/ci-goreleaser:1.17.5
-  environment:
-    CGO_ENABLED: "0"
-
+      - image: bepsays/ci-hugoreleaser:1.22400.20000
+environment: &buildenv
+      GOMODCACHE: /root/project/gomodcache
 version: 2
 jobs:
-  build:
-    <<: *defaults
+  prepare_release:
+    <<: *defaults 
+    environment: &buildenv
+        GOMODCACHE: /root/project/gomodcache
     steps:
-      - checkout:
+      - setup_remote_docker
+      - checkout: 
           path: hugo
+      - &git-config
+        run:
+           command: |
+            git config --global user.email "[email protected]"
+            git config --global user.name "hugoreleaser"
       - run:
-            command: |
-                git clone [email protected]:gohugoio/hugoDocs.git
-                cd hugo
-                go mod download
-                sleep 5
-                go mod verify
-      - persist_to_workspace:
-          root: .
-          paths: .
-  release:
-    <<: *defaults
+          command: |
+            cd hugo
+            go mod download
+            go run -tags release main.go release --step 1
+      - save_cache:
+          key: git-sha-{{ .Revision }}
+          paths:
+            - hugo
+            - gomodcache
+  build_container1:
+    <<: [*defaults]
+    environment:
+      <<: [*buildenv]
     steps:
-      - attach_workspace:
-          at: /root/project
+      - &restore-cache
+        restore_cache:
+          key: git-sha-{{ .Revision }}
       - run:
-            command: |
-                    cd hugo
-                    git config --global user.email "[email protected]"
-                    git config --global user.name "hugoreleaser"
-                    go run -tags release main.go release -r ${CIRCLE_BRANCH}
-
+          no_output_timeout: 20m
+          command: |
+            mkdir -p /tmp/files/dist1
+            cd hugo
+            hugoreleaser build -paths "builds/container1/**" -workers 3 -dist /tmp/files/dist1 -chunks $CIRCLE_NODE_TOTAL -chunk-index $CIRCLE_NODE_INDEX
+      - &persist-workspace
+        persist_to_workspace:
+          root: /tmp/files
+          paths:
+            - dist1
+            - dist2
+    parallelism: 7
+  build_container2:
+    <<: [*defaults]
+    environment:
+        <<: [*buildenv]
+    docker:
+    - image: bepsays/ci-hugoreleaser-linux-arm64:1.22400.20000
+    steps:
+      - *restore-cache
+      - &attach-workspace
+        attach_workspace:
+          at: /tmp/workspace
+      - run:
+          command: |
+                  mkdir -p /tmp/files/dist2
+                  cd hugo
+                  hugoreleaser build -paths "builds/container2/**" -workers 1 -dist /tmp/files/dist2
+      - *persist-workspace
+  archive_and_release:
+    <<: [*defaults]
+    environment:
+        <<: [*buildenv]
+    steps:
+      - *restore-cache
+      - *attach-workspace
+      - *git-config
+      - run:
+          name: Add github.com to known hosts
+          command: ssh-keyscan github.com >> ~/.ssh/known_hosts
+      - run:
+          command: |
+            cp -a /tmp/workspace/dist1/. ./hugo/dist
+            cp -a /tmp/workspace/dist2/. ./hugo/dist
+      - run:
+          command: |
+            cd hugo
+            hugoreleaser archive
+            hugoreleaser release
+            go run -tags release main.go release --step 2
 workflows:
   version: 2
   release:
       jobs:  
-        - build:
+        - prepare_release:
             filters:
               branches:
                 only: /release-.*/
-        - hold:
-            type: approval
+        - build_container1:
+            requires:
+            - prepare_release
+        - build_container2:
             requires:
-              - build
-        - release:
+            - prepare_release
+        - archive_and_release:
             context: org-global
             requires:
-              - hold
+            - build_container1
+            - build_container2
+
+
+

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,11 +1,16 @@
 ---
 name: 'Bug report'
-labels: 'bug'
+labels: 'Bug, NeedsTriage'
 assignees: ''
 about: Create a report to help us improve
 ---
 
-
+<!--
+Please do not use the issue queue for questions or troubleshooting. Unless you are certain that your issue is a software defect, use the forum:
+
+https://discourse.gohugo.io
+-->
+
 <!-- Please answer these questions before submitting your issue. Thanks! -->
 
 ### What version of Hugo are you using (`hugo version`)?

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,8 +1,11 @@
 ---
 name: Proposal
-about: Suggest an idea for Hugo
+about: Propose a new feature for Hugo
 title: ''
-labels: 'Proposal'
+labels: 'Proposal, NeedsTriage'
 assignees: ''
 
 ---
+
+
+<!-- Describe this new feature. Think about if it really belongs in the Hugo core module; you may want to discuss it on https://discourse.gohugo.io/ first.  -->

.github/workflows/image.yml

@@ -0,0 +1,49 @@
+name: Build Docker image
+
+on:
+  release:
+    types: [published]
+  pull_request:
+permissions:
+  packages: write
+
+env:
+  REGISTRY_IMAGE: ghcr.io/gohugoio/hugo
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 # v5.5.1
+        with:
+          images: ${{ env.REGISTRY_IMAGE }}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db # v3.6.1
+
+      - name: Login to GHCR
+        # Login is only needed when the image is pushed
+        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push
+        id: build
+        uses: docker/build-push-action@16ebe778df0e7752d2cfcbd924afdbbd89c1a755 # v6.6.1
+        with:
+          context: .
+          provenance: mode=max
+          sbom: true
+          push: ${{ github.event_name != 'pull_request' }}
+          platforms: linux/amd64,linux/arm64
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: HUGO_BUILD_TAGS=extended,withdeploy

.github/workflows/stale.yml

@@ -0,0 +1,52 @@
+name: 'Close stale and lock closed issues and PRs'
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '30 1 * * *'
+permissions:
+  contents: read
+jobs:
+  stale:
+    permissions:
+      issues: write
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+      - uses: dessant/lock-threads@7de207be1d3ce97a9abe6ff1306222982d1ca9f9 # v5.0.1
+        with:
+          issue-inactive-days: 21
+          add-issue-labels: 'Outdated'
+          issue-comment: >
+            This issue has been automatically locked since there
+            has not been any recent activity after it was closed.
+            Please open a new issue for related bugs.
+          pr-comment: >
+            This pull request has been automatically locked since there
+            has not been any recent activity after it was closed.
+            Please open a new issue for related bugs.
+      - uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # v9.0.0
+        with:
+          operations-per-run: 999
+          days-before-issue-stale: 365
+          days-before-pr-stale: 365
+          days-before-issue-close: 56
+          days-before-pr-close: 56
+          stale-issue-message: >
+            This issue has been automatically marked as stale because it has not had
+            recent activity. The resources of the Hugo team are limited, and so we are asking for your help.
+
+            If this is a **bug** and you can still reproduce this error on the <code>master</code> branch, please reply with all of the information you have about it in order to keep the issue open.
+
+            If this is a **feature request**, and you feel that it is still relevant and valuable, please tell us why.
+
+            This issue will automatically be closed in the near future if no further activity occurs. Thank you for all your contributions.
+          stale-pr-message: This PR has been automatically marked as stale because it has not had
+            recent activity. The resources of the Hugo team are limited, and so we are asking for your help.
+
+            Please check https://github.com/gohugoio/hugo/blob/master/CONTRIBUTING.md#code-contribution and verify that this code contribution fits with the description. If yes, tell is in a comment.
+
+            This PR will automatically be closed in the near future if no further activity occurs. Thank you for all your contributions.
+          stale-issue-label: 'Stale'
+          exempt-issue-labels: 'Keep,Security'
+          stale-pr-label: 'Stale'
+          exempt-pr-labels: 'Keep,Security'