Skip to content

Commit 0446cbc

Browse files
fix(stencil): upgrade modules (2024-05-22) (#37)
* chore: fix rand lint error * chore: all stencil modules are RC --------- Co-authored-by: getoutreach-ci-1[bot] <95656460+getoutreach-ci-1[bot]@users.noreply.github.com> Co-authored-by: Mark Lee <[email protected]>
1 parent 7852b7d commit 0446cbc

File tree

13 files changed

+2018
-1969
lines changed

13 files changed

+2018
-1969
lines changed

.circleci/config.yml

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,16 @@
22
# syntax, such as anchors, will be fixed automatically.
33
version: 2.1
44
orbs:
5-
shared: getoutreach/shared@2.26.0
5+
shared: getoutreach/shared@2.27.0
66
queue: eddiewebb/[email protected]
77

88
parameters:
99
rebuild_cache:
1010
type: boolean
1111
default: false
12+
## <<Stencil::Block(CircleCIExtraParams)>>
13+
14+
## <</Stencil::Block>>
1215

1316
# Extra contexts to expose to all jobs below
1417
contexts: &contexts
@@ -76,7 +79,8 @@ workflows:
7679

7780
release:
7881
when:
79-
not: << pipeline.parameters.rebuild_cache >>
82+
and:
83+
- not: << pipeline.parameters.rebuild_cache >>
8084
jobs:
8185
## <<Stencil::Block(circleWorkflowJobs)>>
8286

@@ -96,12 +100,19 @@ workflows:
96100
- shared/test
97101
filters:
98102
branches:
99-
only: *release_branches
100-
101-
# Dryrun release for PRs.
102-
- shared/release:
103-
<<: *release
103+
only: main
104+
# Dryrun for PRs
105+
- shared/pre-release: &pre-release
104106
dryrun: true
107+
context: *contexts
108+
## <<Stencil::Block(circlePreReleaseDryRunExtra)>>
109+
110+
## <</Stencil::Block>>
111+
requires:
112+
## <<Stencil::Block(circlePreReleaseDryRunRequires)>>
113+
114+
## <</Stencil::Block>>
115+
- shared/test
105116
filters:
106117
branches:
107118
ignore: *release_branches

.goreleaser.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ builds:
1818
- '-X "main.TeleforkAPIKey={{ .Env.TELEFORK_APIKEY }}"'
1919
env:
2020
- CGO_ENABLED=0
21-
### <<Stencil::Block(ghaccesstokenAdditionalEnv)>>
21+
## <<Stencil::Block(ghaccesstokenAdditionalEnv)>>
2222

23-
### <</Stencil::Block>>
23+
## <</Stencil::Block>>
2424

2525
archives: []
2626
checksum:

.tool-versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
## <<Stencil::Block(toolverOverride)>>
66
## <</Stencil::Block>>
77
golang 1.22.0
8-
nodejs 18.17.1
8+
nodejs 20.12.2
99
protoc 21.5
1010
terraform 1.5.7
1111
# Note: Versions in this block do not override the default versions above

.vscode/extensions.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
"zxh404.vscode-proto3",
1010
"redhat.vscode-yaml",
1111
"ms-azuretools.vscode-docker",
12-
"foxundermoon.shell-format"
12+
"foxundermoon.shell-format",
13+
"WizCloud.wizcli-vscode"
1314

1415
// Please consider contributing back all recommended
1516
// extensions to stencil!

cortex.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ info:
4545
repo: https://github.com/getoutreach/ci
4646
framework: stencil
4747
language: Golang
48-
stencil_version: v1.38.0
48+
stencil_version: v1.38.1
4949
golang_version: 1.22.0
5050
cli: true
5151
service: false

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/getoutreach/ci
22

3-
go 1.19
3+
go 1.21
44

55
require (
66
github.com/bradleyfalzon/ghinstallation v1.1.1

go.sum

Lines changed: 19 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/github/github.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
"fmt"
1111
"math/rand"
1212
"net/http"
13-
"time"
1413

1514
"github.com/bradleyfalzon/ghinstallation"
1615
"github.com/getoutreach/gobox/pkg/cfg"
@@ -19,11 +18,6 @@ import (
1918
"github.com/sirupsen/logrus"
2019
)
2120

22-
// init seeds the random generator
23-
func init() { //nolint:gochecknoinits // Why: seeding random
24-
rand.Seed(time.Now().UnixNano())
25-
}
26-
2721
// Credential is a type of credential to use when talking to Github
2822
type Credential struct {
2923
// Name is an optional field to supply to make it easier to identify a

package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"license": "UNLICENSED",
33
"devDependencies": {
4-
"@semantic-release/commit-analyzer": "^10.0.1",
4+
"@semantic-release/commit-analyzer": "^12.0.0",
55
"@semantic-release/exec": "^6.0.3",
66
"@semantic-release/git": "^10.0.1",
7-
"@semantic-release/github": "^9.0.3",
8-
"@semantic-release/npm": "^10.0.4",
9-
"@semantic-release/release-notes-generator": "^11.0.3",
10-
"conventional-changelog-conventionalcommits": "^6.0.0",
7+
"@semantic-release/github": "^10.0.3",
8+
"@semantic-release/npm": "^12.0.0",
9+
"@semantic-release/release-notes-generator": "^13.0.0",
10+
"conventional-changelog-conventionalcommits": "^7.0.2",
1111
"prettier": "^2.8.8",
12-
"semantic-release": "^21.0.5",
13-
"semver": "^7.5.2"
12+
"semantic-release": "^23.0.8",
13+
"semver": "^7.6.0"
1414
}
1515
}

scripts/devbase.sh

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,22 +44,31 @@ gojq() {
4444
local archive="$basename.$ext"
4545

4646
local gojqURL="https://github.com/itchyny/gojq/releases/download/$gojqVersion/$archive"
47-
if [[ ! -e "$gjDir/$archive" ]]; then
48-
curl --fail --location --silent --output "$gjDir/$archive" "$gojqURL"
49-
47+
local archivePath="$gjDir/$archive"
48+
if [[ ! -e $archivePath ]]; then
49+
if command -v busybox >/dev/null; then
50+
busybox wget --quiet --output-document "$archivePath" "$gojqURL"
51+
elif command -v wget >/dev/null; then
52+
wget --quiet --output-document "$archivePath" "$gojqURL"
53+
elif command -v curl >/dev/null; then
54+
curl --fail --location --silent --output "$archivePath" "$gojqURL"
55+
else
56+
echo "No download tool found (looked for busybox, wget, curl)" >&2
57+
exit 1
58+
fi
5059
fi
5160

52-
if [[ ! -e "$gjDir/$archive" ]]; then
61+
if [[ ! -e $archivePath ]]; then
5362
echo "Failed to download gojq ($gojqURL)" >&2
5463
exit 1
5564
fi
5665

5766
if [[ $ext == "zip" ]]; then
5867
# Explanation of flags:
5968
# quiet, junk paths/dont make directories, extract to directory
60-
unzip -q -j -d "$gjDir" "$gjDir/$archive" "$basename/gojq"
69+
unzip -q -j -d "$gjDir" "$archivePath" "$basename/gojq"
6170
else
62-
tar --strip-components=1 --directory="$gjDir" --extract --file="$gjDir/$archive" "$basename/gojq"
71+
tar --strip-components=1 --directory="$gjDir" --extract --file="$archivePath" "$basename/gojq"
6372
fi
6473
mv "$gjDir"/gojq "$gojq"
6574
fi

0 commit comments

Comments
 (0)