Skip to content

Commit 36be6bd

Browse files
authored
Various fixes for development tooling (#566)
1 parent 969e3d0 commit 36be6bd

23 files changed

Lines changed: 39 additions & 48 deletions

.git-hooks/pre-commit

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#!/bin/bash
2-
set -eou pipefail
32

43
## Enable this hook with: git config
54
## git config core.hooksPath .git-hooks/
@@ -42,14 +41,17 @@ validate_compile () {
4241

4342
validate_other () {
4443
echo "[$(date +%Y-%m-%d:%H:%M:%S) $0 ${FUNCNAME[0]}]"
45-
if grep 'set -eou'; then
44+
## grep excluding this file
45+
if git grep 'set -eou' -- ':!'"$0"; then
4646
echo "ERROR: found 'set -eou'! Change to 'set -euo pipefail'." >&2
4747
exit 1
4848
fi
4949
}
5050

5151
########## MAIN BLOCK ##########
5252
# validate_circleci_config
53+
# validate_package_json
5354
validate_compile
5455
validate_version_updated
56+
validate_other
5557
echo "pre-commit checks successful!" >&2

CHANGELOG.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
# [1.4.35](https://github.com/kenherring/ablunit-test-runner/releases/tag/1.4.35) - 2026-04-15 (pre-release)
1+
# [1.4.37](https://github.com/kenherring/ablunit-test-runner/releases/tag/1.4.37) - 2026-04-15 (pre-release)
22

3+
* Various fixes for development tooling (#566)
34
* Trim `windows-` from codepage (#567)
45
* Clear environment variable when `initializationProcedure` is no longer set (#565)
56
* build(deps-dev): bump typescript-eslint from 8.58.0 to 8.58.1 (#563)
@@ -71,7 +72,7 @@
7172
* Bump esbuild from 0.27.0 to 0.27.1 (#457)
7273
* Bump jws from 3.2.2 to 3.2.3 in the npm_and_yarn group across 1 directory (#455)
7374

74-
**Full Changelog**: [1.4.4...1.4.35](https://github.com/kenherring/ablunit-test-runner/compare/1.4.4...1.4.35)
75+
**Full Changelog**: [1.4.4...1.4.37](https://github.com/kenherring/ablunit-test-runner/compare/1.4.4...1.4.37)
7576

7677
# [1.4.4](https://github.com/kenherring/ablunit-test-runner/releases/tag/1.4.4) - 2025-11-26 (pre-release)
7778

docker/compile_deps/create_ablunit_library.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
set -eou pipefail
2+
set -euo pipefail
33

44
## create ablunit.pl
55
PROGRESS_ADE_TAG=$(cat /psc/dlc/version | cut -d ' ' -f3)

docker/docker_build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
set -eou pipefail
2+
set -euo pipefail
33

44
usage () {
55
echo "

docker/entrypoint.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
set -eou pipefail
2+
set -euo pipefail
33

44
log_it () {
55
echo "[$(date +%Y-%m-%d:%H:%M:%S) $0 ${FUNCNAME[1]}]" "$@"
@@ -172,7 +172,7 @@ run_tests_base () {
172172
$BASH_AFTER_ERROR && bash
173173
exit 1
174174
fi
175-
set -eou pipefail
175+
set -euo pipefail
176176
log_it "run_tests success"
177177

178178
if [ -z "${ABLUNIT_TEST_RUNNER_PROJECT_NAME:-}" ]; then

docker/run_tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
set -eou pipefail
2+
set -euo pipefail
33

44
usage () {
55
echo "

package-lock.json

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

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "ablunit-test-runner",
33
"displayName": "ABLUnit Test Runner",
44
"description": "OpenEdge ABLUnit test runner for VSCode",
5-
"version": "1.4.35",
5+
"version": "1.4.37",
66
"engineStrict": true,
77
"galleryBanner": {
88
"color": "#007ACC",

scripts/common.sh

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
set -eou pipefail
2+
set -euo pipefail
33

44
common_init () {
55
echo "RUNNER_DEBUG=${RUNNER_DEBUG:-}"
@@ -80,13 +80,16 @@ setup_xq () {
8080

8181
validate_version_updated() {
8282
log_it 'validating version matches throughout the project...' >&2
83-
local PACKAGE_VERSION SONAR_PROJECT_VERSION CHANGELOG_VERSION
83+
local PACKAGE_VERSION CHANGELOG_VERSION
8484
PACKAGE_VERSION=$(jq -r '.version' package.json)
85-
SONAR_PROJECT_VERSION=$(grep -E '^sonar.projectVersion=' sonar-project.properties | cut -d'=' -f2)
8685

87-
if [ "$PACKAGE_VERSION" != "$SONAR_PROJECT_VERSION" ]; then
88-
log_error "package.json version ($PACKAGE_VERSION) does not match 'sonar.projectVersion' ($SONAR_PROJECT_VERSION) in 'sonar-project.properties'"
89-
exit 1
86+
if grep -q 'sonar.projectVersion=' sonar-project.properties; then
87+
local SONAR_PROJECT_VERSION
88+
SONAR_PROJECT_VERSION=$(grep -E '^sonar.projectVersion=' sonar-project.properties | cut -d'=' -f2)
89+
if [ "$PACKAGE_VERSION" != "$SONAR_PROJECT_VERSION" ]; then
90+
log_error "package.json version ($PACKAGE_VERSION) does not match 'sonar.projectVersion' ($SONAR_PROJECT_VERSION) in 'sonar-project.properties'"
91+
exit 1
92+
fi
9093
fi
9194

9295
CHANGELOG_VERSION=$(head CHANGELOG.md -n 1 | cut -d'[' -f2 | cut -d']' -f1)

scripts/description_update.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
set -eou pipefail
2+
set -euo pipefail
33

44
jq () {
55
jq-windows-amd64.exe "$@"

0 commit comments

Comments
 (0)