Skip to content

Commit

Permalink
Revert "feat: support hyphen (-) in flavor names (#918)"
Browse files Browse the repository at this point in the history
This reverts commit 4a3a474.
  • Loading branch information
cjorge-graphops committed Aug 29, 2024
1 parent ecffbcb commit 0f97156
Show file tree
Hide file tree
Showing 12 changed files with 82 additions and 76 deletions.
3 changes: 3 additions & 0 deletions .husky/commit-msg
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

yarn commitlint --edit $1
3 changes: 3 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
#!/usr/bin/env sh
. "$(dirname "$0")/_/husky.sh"

set -e

readonly BASEDIR="$(dirname -- "$0")"
Expand Down
Binary file modified .yarn/install-state.gz
Binary file not shown.
2 changes: 1 addition & 1 deletion arbitrum/helmfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ environments:
environments:
{{ .Environment.Name }}:
values:
- _defaults: {{ .Values._namespaceDefaults | get ( .Values.flavor | replace "-" "_" ) | toYaml | nindent 10 }}
- _defaults: {{ .Values._namespaceDefaults | get .Values.flavor | toYaml | nindent 10 }}

---
# Define default features when undefined
Expand Down
2 changes: 1 addition & 1 deletion celo/helmfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ environments:
environments:
{{ .Environment.Name }}:
values:
- _defaults: {{ .Values._namespaceDefaults | get ( .Values.flavor | replace "-" "_" ) | toYaml | nindent 10 }}
- _defaults: {{ .Values._namespaceDefaults | get .Values.flavor | toYaml | nindent 10 }}

---
# Define default features when undefined
Expand Down
2 changes: 1 addition & 1 deletion ethereum/helmfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ environments:
environments:
{{ .Environment.Name }}:
values:
- _defaults: {{ .Values._namespaceDefaults | get ( .Values.flavor | replace "-" "_" ) | toYaml | nindent 10 }}
- _defaults: {{ .Values._namespaceDefaults | get .Values.flavor | toYaml | nindent 10 }}

---
# Define default features when undefined
Expand Down
2 changes: 1 addition & 1 deletion gnosis/helmfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ environments:
environments:
{{ .Environment.Name }}:
values:
- _defaults: {{ .Values._namespaceDefaults | get ( .Values.flavor | replace "-" "_" ) | toYaml | nindent 10 }}
- _defaults: {{ .Values._namespaceDefaults | get .Values.flavor | toYaml | nindent 10 }}

---
# Define default features when undefined
Expand Down
2 changes: 1 addition & 1 deletion graph/helmfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ environments:
environments:
{{ .Environment.Name }}:
values:
- _defaults: {{ .Values._namespaceDefaults | get ( .Values.flavor | replace "-" "_" ) | toYaml | nindent 10 }}
- _defaults: {{ .Values._namespaceDefaults | get .Values.flavor | toYaml | nindent 10 }}

---
# Define default features when undefined
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
"private": true,
"packageManager": "yarn@4.3.1",
"devDependencies": {
"@commitlint/cli": "^19.4.1",
"@commitlint/config-conventional": "^19.4.1",
"git-cliff": "^2.5.0",
"husky": "^9.1.5",
"@commitlint/cli": "^19.3.0",
"@commitlint/config-conventional": "^19.2.2",
"git-cliff": "^2.4.0",
"husky": "^9.1.4",
"swagger-cli": "^4.0.4"
},
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion polygon/helmfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ environments:
environments:
{{ .Environment.Name }}:
values:
- _defaults: {{ .Values._namespaceDefaults | get ( .Values.flavor | replace "-" "_" ) | toYaml | nindent 10 }}
- _defaults: {{ .Values._namespaceDefaults | get .Values.flavor | toYaml | nindent 10 }}

---
# Define default features when undefined
Expand Down
4 changes: 2 additions & 2 deletions src/schemas/build_tool.cue
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ command: {
print: cli.Print & {text: _out.out}
}
"build:renovate": {
_out: _renovate.render
_out: _renovate.render
print: cli.Print & {text: _out.out}
}
}
Expand Down Expand Up @@ -244,7 +244,7 @@ _helmfile: {
"_defaults": "{{ .Values._namespaceDefaults.common | toYaml | nindent 10 }}"
}
if _namespaces[this].values.flavor != _|_ {
"_defaults": "{{ .Values._namespaceDefaults | get ( .Values.flavor | replace \"-\" \"_\" ) | toYaml | nindent 10 }}"
"_defaults": "{{ .Values._namespaceDefaults | get .Values.flavor | toYaml | nindent 10 }}"
}
}

Expand Down
128 changes: 64 additions & 64 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -89,30 +89,30 @@ __metadata:
languageName: node
linkType: hard

"@commitlint/cli@npm:^19.4.1":
version: 19.4.1
resolution: "@commitlint/cli@npm:19.4.1"
"@commitlint/cli@npm:^19.3.0":
version: 19.3.0
resolution: "@commitlint/cli@npm:19.3.0"
dependencies:
"@commitlint/format": "npm:^19.3.0"
"@commitlint/lint": "npm:^19.4.1"
"@commitlint/load": "npm:^19.4.0"
"@commitlint/read": "npm:^19.4.0"
"@commitlint/lint": "npm:^19.2.2"
"@commitlint/load": "npm:^19.2.0"
"@commitlint/read": "npm:^19.2.1"
"@commitlint/types": "npm:^19.0.3"
execa: "npm:^8.0.1"
yargs: "npm:^17.0.0"
bin:
commitlint: cli.js
checksum: 10/9199d3c6587476ba94dca4f55928d4461a6f380a96861e20a11d363ff9744b8f9a5955407510020402c15b226c5505e4050a9a21dd7d096f9bfc30bb3571edf7
checksum: 10/b1565c0529b8a27ebb3313230f5ddf2f72c5dd819073b2ec141ea1547dfc4de3400a7208ae4f93b071cf8a6a2736aaeb1348c722f6e4627dc964dd0976a37810
languageName: node
linkType: hard

"@commitlint/config-conventional@npm:^19.4.1":
version: 19.4.1
resolution: "@commitlint/config-conventional@npm:19.4.1"
"@commitlint/config-conventional@npm:^19.2.2":
version: 19.2.2
resolution: "@commitlint/config-conventional@npm:19.2.2"
dependencies:
"@commitlint/types": "npm:^19.0.3"
conventional-changelog-conventionalcommits: "npm:^7.0.2"
checksum: 10/a1bcee880f3c167e605758710e75665485f62904702a40db326cc285dcb68b512e346cbe58533b91e115e2ac2e732d72249cba3e49350c1763b95d78e62a8181
checksum: 10/9ee17ba00f9182fda544c247bc1d130f65d1bb0d4d9953d5c3d1e4fd36211386c1e849a28e823574546a8bc3df3d0c269122258e21a55d3c12b3e64c00ab50b6
languageName: node
linkType: hard

Expand Down Expand Up @@ -167,21 +167,21 @@ __metadata:
languageName: node
linkType: hard

"@commitlint/lint@npm:^19.4.1":
version: 19.4.1
resolution: "@commitlint/lint@npm:19.4.1"
"@commitlint/lint@npm:^19.2.2":
version: 19.2.2
resolution: "@commitlint/lint@npm:19.2.2"
dependencies:
"@commitlint/is-ignored": "npm:^19.2.2"
"@commitlint/parse": "npm:^19.0.3"
"@commitlint/rules": "npm:^19.4.1"
"@commitlint/rules": "npm:^19.0.3"
"@commitlint/types": "npm:^19.0.3"
checksum: 10/57f264eafbd787015d589f663917e19e5f246b3ffd162064cb004009532e541191b13d482174f43a7f5953accf183682d580bf7914552061987efc58811659d8
checksum: 10/9bf2ffa0f6cdde3d53d755b95ca717afd193f4560ae5bb0f5ffd7f1bbd571ddc99b27417733c70e1adbd74a5197e4525493b2dfc116680a939db7728fefa805c
languageName: node
linkType: hard

"@commitlint/load@npm:^19.4.0":
version: 19.4.0
resolution: "@commitlint/load@npm:19.4.0"
"@commitlint/load@npm:^19.2.0":
version: 19.2.0
resolution: "@commitlint/load@npm:19.2.0"
dependencies:
"@commitlint/config-validator": "npm:^19.0.3"
"@commitlint/execute-rule": "npm:^19.0.0"
Expand All @@ -193,7 +193,7 @@ __metadata:
lodash.isplainobject: "npm:^4.0.6"
lodash.merge: "npm:^4.6.2"
lodash.uniq: "npm:^4.5.0"
checksum: 10/ebf3c8f4567cef9b4099d740f145eea6dc8335059ebfbda18d9c65701b810c46634aeeea721a6c7ebbef6cf8d11ccf1402891fee89ca90652f723987ee5c410c
checksum: 10/5cd35a0a60064c70c06ab6bd8b1ae02cf6ecc1d0520b76c68cdc7c12094338f04c19e2df5d7ae30d681e858871c4f1963ae39e4969ed61139959cf4b300030fc
languageName: node
linkType: hard

Expand All @@ -215,16 +215,16 @@ __metadata:
languageName: node
linkType: hard

"@commitlint/read@npm:^19.4.0":
version: 19.4.0
resolution: "@commitlint/read@npm:19.4.0"
"@commitlint/read@npm:^19.2.1":
version: 19.2.1
resolution: "@commitlint/read@npm:19.2.1"
dependencies:
"@commitlint/top-level": "npm:^19.0.0"
"@commitlint/types": "npm:^19.0.3"
execa: "npm:^8.0.1"
git-raw-commits: "npm:^4.0.0"
minimist: "npm:^1.2.8"
checksum: 10/732ab482c3acc7cf00d28db02d45701f38c381712a46e2d5f5f7faabc14b87d849c64184df80b7d197083a71fbd7ec05cc5ae6a1814c1590543f9489e46f9d28
checksum: 10/840ebd183b2fe36dea03701552d825a9a1770d300b9416ab2a731fdeed66cf8c9dd8be133d92ac017cb9bf29e2ef5aee91a641f2b643bb5b33005f7b392ec953
languageName: node
linkType: hard

Expand All @@ -242,16 +242,16 @@ __metadata:
languageName: node
linkType: hard

"@commitlint/rules@npm:^19.4.1":
version: 19.4.1
resolution: "@commitlint/rules@npm:19.4.1"
"@commitlint/rules@npm:^19.0.3":
version: 19.0.3
resolution: "@commitlint/rules@npm:19.0.3"
dependencies:
"@commitlint/ensure": "npm:^19.0.3"
"@commitlint/message": "npm:^19.0.0"
"@commitlint/to-lines": "npm:^19.0.0"
"@commitlint/types": "npm:^19.0.3"
execa: "npm:^8.0.1"
checksum: 10/c5626278aa6ee08194f1b7880345fcbc64b19a2f7ca52f54cd027fb19337fb60008b55a2fe7a4159dd227d41ffb48b30e51347101a58f842d37991a416a678a7
checksum: 10/218033d96b0bae7dbea0e46483f8af823c17b492e4b0c4dca93a6312876d051cc88f4272d009e7eb06ff05585ec511aedd703132be17c7248698a4eac909986b
languageName: node
linkType: hard

Expand Down Expand Up @@ -705,59 +705,59 @@ __metadata:
languageName: node
linkType: hard

"git-cliff-darwin-arm64@npm:2.5.0":
version: 2.5.0
resolution: "git-cliff-darwin-arm64@npm:2.5.0"
"git-cliff-darwin-arm64@npm:2.4.0":
version: 2.4.0
resolution: "git-cliff-darwin-arm64@npm:2.4.0"
conditions: os=darwin & cpu=arm64
languageName: node
linkType: hard

"git-cliff-darwin-x64@npm:2.5.0":
version: 2.5.0
resolution: "git-cliff-darwin-x64@npm:2.5.0"
"git-cliff-darwin-x64@npm:2.4.0":
version: 2.4.0
resolution: "git-cliff-darwin-x64@npm:2.4.0"
conditions: os=darwin & cpu=x64
languageName: node
linkType: hard

"git-cliff-linux-arm64@npm:2.5.0":
version: 2.5.0
resolution: "git-cliff-linux-arm64@npm:2.5.0"
"git-cliff-linux-arm64@npm:2.4.0":
version: 2.4.0
resolution: "git-cliff-linux-arm64@npm:2.4.0"
conditions: os=linux & cpu=arm64
languageName: node
linkType: hard

"git-cliff-linux-x64@npm:2.5.0":
version: 2.5.0
resolution: "git-cliff-linux-x64@npm:2.5.0"
"git-cliff-linux-x64@npm:2.4.0":
version: 2.4.0
resolution: "git-cliff-linux-x64@npm:2.4.0"
conditions: os=linux & cpu=x64
languageName: node
linkType: hard

"git-cliff-windows-arm64@npm:2.5.0":
version: 2.5.0
resolution: "git-cliff-windows-arm64@npm:2.5.0"
"git-cliff-windows-arm64@npm:2.4.0":
version: 2.4.0
resolution: "git-cliff-windows-arm64@npm:2.4.0"
conditions: os=win32 & cpu=arm64
languageName: node
linkType: hard

"git-cliff-windows-x64@npm:2.5.0":
version: 2.5.0
resolution: "git-cliff-windows-x64@npm:2.5.0"
"git-cliff-windows-x64@npm:2.4.0":
version: 2.4.0
resolution: "git-cliff-windows-x64@npm:2.4.0"
conditions: os=win32 & cpu=x64
languageName: node
linkType: hard

"git-cliff@npm:^2.5.0":
version: 2.5.0
resolution: "git-cliff@npm:2.5.0"
"git-cliff@npm:^2.4.0":
version: 2.4.0
resolution: "git-cliff@npm:2.4.0"
dependencies:
execa: "npm:^8.0.1"
git-cliff-darwin-arm64: "npm:2.5.0"
git-cliff-darwin-x64: "npm:2.5.0"
git-cliff-linux-arm64: "npm:2.5.0"
git-cliff-linux-x64: "npm:2.5.0"
git-cliff-windows-arm64: "npm:2.5.0"
git-cliff-windows-x64: "npm:2.5.0"
git-cliff-darwin-arm64: "npm:2.4.0"
git-cliff-darwin-x64: "npm:2.4.0"
git-cliff-linux-arm64: "npm:2.4.0"
git-cliff-linux-x64: "npm:2.4.0"
git-cliff-windows-arm64: "npm:2.4.0"
git-cliff-windows-x64: "npm:2.4.0"
dependenciesMeta:
git-cliff-darwin-arm64:
optional: true
Expand All @@ -773,7 +773,7 @@ __metadata:
optional: true
bin:
git-cliff: lib/cli/cli.js
checksum: 10/98dcbacb1cfcd2b7ed4add2ae1096ddcdd8360fc82a62c32e9ad441909da00d3319437d10d344b296797de9610a17627e27739a7c10d1a20f3afcec4b6100b99
checksum: 10/74f7f46766a7f81bf7930c72b2f0079e2832581082290ff46db00df1711c2c09d26e06a0c290dc6cd326f88f860791e7b0c521de607fac7d0d0cdb83ca8f3a88
languageName: node
linkType: hard

Expand Down Expand Up @@ -820,12 +820,12 @@ __metadata:
languageName: node
linkType: hard

"husky@npm:^9.1.5":
version: 9.1.5
resolution: "husky@npm:9.1.5"
"husky@npm:^9.1.4":
version: 9.1.4
resolution: "husky@npm:9.1.4"
bin:
husky: bin.js
checksum: 10/21a3036dd03141c41347693bde301c62502b4e3bffb87310e7e42b3011c2e55691af2e4a9a5f39bd94e6b1d69e3cfc26ec636d8e164e19737b26f11c556caf10
checksum: 10/c43aa7cbf98246d4f347bc3da807049555b5003af7c6e1658c5cea44a9743b4d0683c72973a4fe02a4ccceb81031a664ecaa7a1a86efe4d37a80a0af17c988ea
languageName: node
linkType: hard

Expand Down Expand Up @@ -961,10 +961,10 @@ __metadata:
version: 0.0.0-use.local
resolution: "launchpad-namespaces@workspace:."
dependencies:
"@commitlint/cli": "npm:^19.4.1"
"@commitlint/config-conventional": "npm:^19.4.1"
git-cliff: "npm:^2.5.0"
husky: "npm:^9.1.5"
"@commitlint/cli": "npm:^19.3.0"
"@commitlint/config-conventional": "npm:^19.2.2"
git-cliff: "npm:^2.4.0"
husky: "npm:^9.1.4"
swagger-cli: "npm:^4.0.4"
languageName: unknown
linkType: soft
Expand Down

0 comments on commit 0f97156

Please sign in to comment.