mirror of
https://github.com/gohugoio/hugo.git
synced 2024-11-21 20:46:30 -05:00
Revert "Adjust Circleci workflow to make the Docker images build"
This reverts commit 445283a593.
This commit is contained in:
Bjørn Erik Pedersen
parent
445283a593
commit
261d7a03ae
3 changed files with 113 additions and 144 deletions
|
|
@ -1,120 +0,0 @@
|
||||||
version: 2.1
|
|
||||||
|
|
||||||
# Passed from config.yml
|
|
||||||
parameters:
|
|
||||||
skip:
|
|
||||||
type: boolean
|
|
||||||
default: true
|
|
||||||
|
|
||||||
defaults: &defaults
|
|
||||||
resource_class: large
|
|
||||||
docker:
|
|
||||||
- image: bepsays/ci-hugoreleaser:1.22300.20000
|
|
||||||
environment: &buildenv
|
|
||||||
GOMODCACHE: /root/project/gomodcache
|
|
||||||
jobs:
|
|
||||||
prepare_release:
|
|
||||||
<<: *defaults
|
|
||||||
environment: &buildenv
|
|
||||||
GOMODCACHE: /root/project/gomodcache
|
|
||||||
steps:
|
|
||||||
- &remote-docker
|
|
||||||
setup_remote_docker:
|
|
||||||
version: 20.10.14
|
|
||||||
- checkout:
|
|
||||||
path: hugo
|
|
||||||
- &git-config
|
|
||||||
run:
|
|
||||||
command: |
|
|
||||||
git config --global user.email "bjorn.erik.pedersen+hugoreleaser@gmail.com"
|
|
||||||
git config --global user.name "hugoreleaser"
|
|
||||||
- run:
|
|
||||||
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:
|
|
||||||
- &restore-cache
|
|
||||||
restore_cache:
|
|
||||||
key: git-sha-{{ .Revision }}
|
|
||||||
- run:
|
|
||||||
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.22300.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:
|
|
||||||
release:
|
|
||||||
when:
|
|
||||||
and:
|
|
||||||
- equal: [false, << pipeline.parameters.skip >>]
|
|
||||||
jobs:
|
|
||||||
- prepare_release:
|
|
||||||
filters:
|
|
||||||
branches:
|
|
||||||
only: /release-.*/
|
|
||||||
- build_container1:
|
|
||||||
requires:
|
|
||||||
- prepare_release
|
|
||||||
- build_container2:
|
|
||||||
requires:
|
|
||||||
- prepare_release
|
|
||||||
- archive_and_release:
|
|
||||||
context: org-global
|
|
||||||
requires:
|
|
||||||
- build_container1
|
|
||||||
- build_container2
|
|
||||||
|
|
@ -1,27 +1,117 @@
|
||||||
version: 2.1
|
parameters:
|
||||||
setup: true
|
|
||||||
orbs:
|
# v2: 11m.
|
||||||
continuation: circleci/continuation@1
|
defaults: &defaults
|
||||||
|
resource_class: large
|
||||||
|
docker:
|
||||||
|
- image: bepsays/ci-hugoreleaser:1.22300.20000
|
||||||
|
environment: &buildenv
|
||||||
|
GOMODCACHE: /root/project/gomodcache
|
||||||
|
version: 2
|
||||||
jobs:
|
jobs:
|
||||||
setup:
|
prepare_release:
|
||||||
docker:
|
<<: *defaults
|
||||||
- image: cimg/go:1.21
|
environment: &buildenv
|
||||||
|
GOMODCACHE: /root/project/gomodcache
|
||||||
steps:
|
steps:
|
||||||
- checkout
|
- &remote-docker
|
||||||
|
setup_remote_docker:
|
||||||
|
version: 20.10.14
|
||||||
|
- checkout:
|
||||||
|
path: hugo
|
||||||
|
- &git-config
|
||||||
|
run:
|
||||||
|
command: |
|
||||||
|
git config --global user.email "bjorn.erik.pedersen+hugoreleaser@gmail.com"
|
||||||
|
git config --global user.name "hugoreleaser"
|
||||||
- run:
|
- run:
|
||||||
command: |
|
command: |
|
||||||
export SKIP=$(git log -n 1 $CIRCLE_SHA1 --pretty=%B | grep -q "NOCIRCLECI" && echo "true" || echo "false")
|
cd hugo
|
||||||
echo "{\"skip\": $SKIP}" >> set-up-params.json
|
go mod download
|
||||||
- continuation/continue:
|
go run -tags release main.go release --step 1
|
||||||
parameters: set-up-params.json
|
- save_cache:
|
||||||
configuration_path: .circleci/build.yml
|
key: git-sha-{{ .Revision }}
|
||||||
|
paths:
|
||||||
|
- hugo
|
||||||
|
- gomodcache
|
||||||
|
build_container1:
|
||||||
|
<<: [*defaults]
|
||||||
|
environment:
|
||||||
|
<<: [*buildenv]
|
||||||
|
steps:
|
||||||
|
- &restore-cache
|
||||||
|
restore_cache:
|
||||||
|
key: git-sha-{{ .Revision }}
|
||||||
|
- run:
|
||||||
|
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.22300.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:
|
workflows:
|
||||||
configure:
|
version: 2
|
||||||
when:
|
release:
|
||||||
and:
|
jobs:
|
||||||
- matches:
|
- prepare_release:
|
||||||
pattern: "^release.+"
|
filters:
|
||||||
value: << pipeline.git.branch >>
|
branches:
|
||||||
jobs:
|
only: /release-.*/
|
||||||
- setup
|
- build_container1:
|
||||||
|
requires:
|
||||||
|
- prepare_release
|
||||||
|
- build_container2:
|
||||||
|
requires:
|
||||||
|
- prepare_release
|
||||||
|
- archive_and_release:
|
||||||
|
context: org-global
|
||||||
|
requires:
|
||||||
|
- build_container1
|
||||||
|
- build_container2
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -101,8 +101,7 @@ func (r *ReleaseHandler) Run() error {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
// The reason we use NOCIRCLECI, see https://github.com/gohugoio/hugo/issues/12753
|
if _, err := r.git("commit", "-a", "-m", fmt.Sprintf("%s Bump versions for release of %s\n\n[ci skip]", commitPrefix, newVersion)); err != nil {
|
||||||
if _, err := r.git("commit", "-a", "-m", fmt.Sprintf("%s Bump versions for release of %s\n\nNOCIRCLECI", commitPrefix, newVersion)); err != nil {
|
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue