STRLCPY/syft

feat: update golang to 1.19 (#1526)

* feat: update golang to 1.19

Signed-off-by: Bradley Jones <[email protected]>

* chore: break out json schema drift check into separate script

Signed-off-by: Alex Goodman <[email protected]>

* chore: update git index refresh

Signed-off-by: Christopher Phillips <[email protected]>

---------

Signed-off-by: Bradley Jones <[email protected]>
Signed-off-by: Alex Goodman <[email protected]>
Signed-off-by: Christopher Phillips <[email protected]>

Bradley Jones committed with GitHub 1 year ago

cdac2245

1 parent 8dba4c33

Revision indexing in progress... (symbol navigation in revisions will be accurate after indexed)

Total 9 files Show one by one

■ ■ ■ ■ ■ ■

.github/actions/bootstrap/action.yaml

		skipped 3 lines
4	4		go-version:
5	5		description: "Go version to install"
6	6		required: true
7		-	default: "1.18.x"
	7	+	default: "1.19.x"
8	8		use-go-cache:
9	9		description: "Restore go cache"
10	10		required: true
		skipped 72 lines

■ ■ ■ ■ ■ ■

.github/scripts/go-mod-tidy-check.sh

		skipped 3 lines
4	4		ORIGINAL_STATE_DIR=$(mktemp -d "TEMP-original-state-XXXXXXXXX")
5	5		TIDY_STATE_DIR=$(mktemp -d "TEMP-tidy-state-XXXXXXXXX")
6	6
7		-	trap "cp ${ORIGINAL_STATE_DIR}/* ./ && rm -fR ${ORIGINAL_STATE_DIR} ${TIDY_STATE_DIR}" EXIT
	7	+	trap "cp -p ${ORIGINAL_STATE_DIR}/* ./ && git update-index -q --refresh && rm -fR ${ORIGINAL_STATE_DIR} ${TIDY_STATE_DIR}" EXIT
8	8
9	9		# capturing original state of files...
10	10		cp go.mod go.sum "${ORIGINAL_STATE_DIR}"
		skipped 21 lines

■ ■ ■ ■ ■ ■

.github/scripts/json-schema-drift-check.sh

1	+	#!/usr/bin/env bash
2	+	set -u
3	+
4	+	if ! git diff-index --quiet HEAD --; then
5	+	git diff-index HEAD --
6	+	git --no-pager diff
7	+	echo "there are uncommitted changes, please commit them before running this check"
8	+	exit 1
9	+	fi
10	+
11	+	success=true
12	+
13	+	if ! make generate-json-schema; then
14	+	echo "Generating json schema failed"
15	+	success=false
16	+	fi
17	+
18	+	if ! git diff-index --quiet HEAD --; then
19	+	git diff-index HEAD --
20	+	git --no-pager diff
21	+	echo "JSON schema drift detected!"
22	+	success=false
23	+	fi
24	+
25	+	if ! $success; then
26	+	exit 1
27	+	fi
28	+

■ ■ ■ ■ ■ ■

.github/workflows/release.yaml

skipped 8 lines
9 9 - "v*"
10 10
11 11 env:
12 - GO_VERSION: "1.18.x"
12 + GO_VERSION: "1.19.x"
13 13
14 14 jobs:
15 15 quality-gate:
skipped 145 lines

All occurrences

■ ■ ■ ■ ■ ■

.github/workflows/update-bootstrap-tools.yml

		skipped 5 lines
6	6		workflow_dispatch:
7	7
8	8		env:
9		-	GO_VERSION: "1.18.x"
	9	+	GO_VERSION: "1.19.x"
10	10		GO_STABLE_VERSION: true
11	11
12	12		jobs:
		skipped 64 lines

■ ■ ■ ■ ■ ■

.github/workflows/update-stereoscope-release.yml

		skipped 5 lines
6	6		workflow_dispatch:
7	7
8	8		env:
9		-	GO_VERSION: "1.18.x"
	9	+	GO_VERSION: "1.19.x"
10	10		GO_STABLE_VERSION: true
11	11
12	12		jobs:
		skipped 40 lines

■ ■ ■ ■ ■ ■

CONTRIBUTING.md

1		-	# Contributing to Syft
	1	+	[#](#) Contributing to Syft
2	2
3	3		If you are looking to contribute to this project and want to open a GitHub pull request ("PR"), there are a few guidelines of what we are looking for in patches. Make sure you go through this document and ensure that your code proposal is aligned.
4	4
		skipped 5 lines
10	10
11	11		You will need to install Go. The version on https://go.dev works best, using the system golang doesn't always work the way you might expect.
12	12
13		-	At the time of writing, Go 1.19 does not work correctly with Syft. Please use Go 1.18 for now.
	13	+	Refer to the go.mod file in the root of this repo for the recommended version of Go to install.
14	14
15	15		You will also need Docker. There's no reason the system packages shouldn't work, but we used the official Docker package. You can find instructions for installing Docker in Debian [here](https://docs.docker.com/engine/install/debian/).
16	16
		skipped 139 lines

■ ■ ■ ■ ■ ■

Makefile

		skipped 131 lines
132	132
133	133		check-json-schema-drift:
134	134		$(call title,Ensure there is no drift between the JSON schema and the code)
135		-	@git diff-index --quiet HEAD -- \|\| (echo "there are uncommitted changes, please commit them before running this check" && false)
136		-	@make generate-json-schema \|\| (echo "$(RED)$(BOLD)JSON schema drift detected!$(RESET)" && false)
137		-	@git diff-index --quiet HEAD -- \|\| (echo "$(RED)$(BOLD)JSON schema drift detected!$(RESET)" && false)
138		-
	135	+	@.github/scripts/json-schema-drift-check.sh
139	136
140	137		## Testing targets #################################
141	138
		skipped 232 lines

■ ■ ■ ■ ■ ■

go.mod

1 1 module github.com/anchore/syft
2 2
3 - go 1.18
3 + go 1.19
4 4
5 5 require (
6 6 github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d
skipped 153 lines

All occurrences

		skipped 8 lines
9	9		- "v*"
10	10
11	11		env:
12		-	GO_VERSION: "1.18.x"
	12	+	GO_VERSION: "1.19.x"
13	13
14	14		jobs:
15	15		quality-gate:
		skipped 145 lines

1	1		module github.com/anchore/syft
2	2
3		-	go 1.18
	3	+	go 1.19
4	4
5	5		require (
6	6		github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d
		skipped 153 lines