diff --git a/.github/actions/bootstrap/action.yaml b/.github/actions/bootstrap/action.yaml index 82a69b78c..863ba194e 100644 --- a/.github/actions/bootstrap/action.yaml +++ b/.github/actions/bootstrap/action.yaml @@ -6,10 +6,6 @@ description: "Bootstrap all syft tools and dependencies on top of go-make's setu # We add the syft-specific extras here: apt packages and the test fixture cache. inputs: - go-version: - description: "Go version to install (passed to go-make/setup)" - required: true - default: "1.26.2" cache-key-prefix: description: "Prefix all cache keys with this value (passed to go-make/setup)" required: true @@ -32,7 +28,6 @@ runs: - name: Setup go + go-make tooling uses: anchore/go-make/.github/actions/setup@abf41688f36f2cbec13105747abbe8e60f5c56ca # v0.9.3 with: - go-version: ${{ inputs.go-version }} cache-key-prefix: ${{ inputs.cache-key-prefix }} cache-enabled: ${{ inputs.cache-enabled }} diff --git a/.github/workflows/validations.yaml b/.github/workflows/validations.yaml index 18eb48bce..f12b1b0bb 100644 --- a/.github/workflows/validations.yaml +++ b/.github/workflows/validations.yaml @@ -100,9 +100,6 @@ jobs: # are unavailable here (`make unit` skips the fixture refresh on windows) - name: Setup go + go-make tooling uses: anchore/go-make/.github/actions/setup@abf41688f36f2cbec13105747abbe8e60f5c56ca # v0.9.3 - with: - # keep in sync with the go-version default in ./.github/actions/bootstrap - go-version: "1.26.2" # the binny-free version of `make download-test-fixture-cache` (keep the oras version in sync with .binny.yaml) - name: Download test fixture cache @@ -196,9 +193,6 @@ jobs: # go-make's setup only (not ./.github/actions/bootstrap): the test only needs make + the snapshot binary - name: Setup go + go-make tooling uses: anchore/go-make/.github/actions/setup@abf41688f36f2cbec13105747abbe8e60f5c56ca # v0.9.3 - with: - # keep in sync with the go-version default in ./.github/actions/bootstrap - go-version: "1.26.2" - name: Install Podman run: | @@ -229,9 +223,6 @@ jobs: # go-make's setup only (not ./.github/actions/bootstrap): the test only needs make + the snapshot binary - name: Setup go + go-make tooling uses: anchore/go-make/.github/actions/setup@abf41688f36f2cbec13105747abbe8e60f5c56ca # v0.9.3 - with: - # keep in sync with the go-version default in ./.github/actions/bootstrap - go-version: "1.26.2" - name: Install Buildah run: | diff --git a/internal/spdxlicense/license_list.go b/internal/spdxlicense/license_list.go index 1a4357378..53a346368 100644 --- a/internal/spdxlicense/license_list.go +++ b/internal/spdxlicense/license_list.go @@ -2131,40 +2131,40 @@ var urlToLicense = map[string]string{ "raw.githubusercontent.com/NTIA/scos-sensor/refs/heads/master/LICENSE.md": "NTIA-PD", "raw.githubusercontent.com/OpenMDW/OpenMDW/refs/heads/main/1.0/LICENSE.openmdw": "OpenMDW-1.0", "raw.githubusercontent.com/blackhole89/notekit/master/data/fonts/Charter%20license.txt": "Bitstream-Charter", - "raw.githubusercontent.com/landtuna/open-mtools/6c04c2882eca7c4313ec267766ea53ac9bfe129b/mdump.c": "Informatica", - "raw.githubusercontent.com/landtuna/open-mtools/6c04c2882eca7c4313ec267766ea53ac9bfe129b/msend.c": "Informatica", - "rc.quest.com/topics/openssh/license.php#tcpwrappers": "TCP-wrappers", - "research.cs.wisc.edu/condor/license.html#condor": "Condor-1.1", - "research.scea.com/scea_shared_source_license.html": "SCEA", - "romanrm.net/mit-zero": "MIT-0", - "sam.zoy.org/wtfpl/COPYING": "WTFPL", - "scancode-licensedb.aboutcode.org/bsd-unchanged": "BSD-2-Clause-pos-unchanged", - "scripts.sil.org/cms/scripts/page.php?item_id=OFL10_web": "OFL-1.0-no-RFN", - "scripts.sil.org/cms/scripts/page.php?item_id=OFL_web": "OFL-1.1-no-RFN", - "slicer.org/LICENSE": "3D-Slicer-1.0", - "solderpad.org/licenses/SHL-0.5/": "SHL-0.5", - "solderpad.org/licenses/SHL-0.51/": "SHL-0.51", - "source.icu-project.org/repos/icu/icu/trunk/license.html": "ICU", - "sourceforge.net/p/buddy/gitcode/ci/master/tree/README": "Buddy", - "sourceforge.net/p/ctrio/git/ci/master/tree/README": "ISC-Veillard", - "sourceforge.net/p/mcj/xfig/ci/master/tree/src/Makefile.am": "Xfig", - "sourceforge.net/p/netpbm/code/HEAD/tree/super_stable/converter/other/pnmtorle.c": "URT-RLE", - "sourceforge.net/p/netpbm/code/HEAD/tree/super_stable/converter/other/rletopnm.c": "URT-RLE", - "sourceforge.net/p/netpbm/code/HEAD/tree/super_stable/converter/ppm/ppmtompeg/jrevdct.c#l1189": "MPEG-SSG", - "sourceforge.net/p/netpbm/code/HEAD/tree/super_stable/editor/pnmstitch.c#l2": "pnmstitch", - "sourceforge.net/p/netpbm/code/HEAD/tree/super_stable/netpbm.c#l8": "HPND-Pbmplus", - "sourceforge.net/p/sbcl/sbcl/ci/master/tree/src/code/loop.lisp": "LOOP", - "sourceforge.net/p/trustedqsl/tqsl/ci/master/tree/LICENSE.txt": "TrustedQSL", - "sourceforge.net/p/xmedcon/code/ci/master/tree/libs/dicom/README": "OFFIS", - "sourceforge.net/p/xmedcon/code/ci/master/tree/libs/ljpg/": "IJG-short", - "sourceforge.net/projects/sevenzip/files/LZMA%20SDK/": "LZMA-SDK-9.22", - "sources.debian.org/copyright/license/debianutils/4.11.2/": "SMAIL-GPL", - "sources.debian.org/src/openmpi/4.1.0-10/ompi/debuggers/msgq_interface.h/?hl=19#L19": "mpi-permissive", - "sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/licenses/BitTorrent?r1=1.1&r2=1.1.1.1&diff_format=s": "BitTorrent-1.0", - "sourceware.org/bzip2/1.0.5/bzip2-manual-1.0.5.html": "bzip2-1.0.6", - "sourceware.org/cgit/binutils-gdb/tree/include/coff/sym.h#n11": "MIPS", - "sourceware.org/cgit/binutils-gdb/tree/include/coff/symconst.h#n11": "ThirdEye", - "sourceware.org/cgit/valgrind/tree/mpi/libmpiwrap.c": "bzip2-1.0.6", + "raw.githubusercontent.com/landtuna/open-mtools/6c04c2882eca7c4313ec267766ea53ac9bfe129b/mdump.c": "Informatica", + "raw.githubusercontent.com/landtuna/open-mtools/6c04c2882eca7c4313ec267766ea53ac9bfe129b/msend.c": "Informatica", + "rc.quest.com/topics/openssh/license.php#tcpwrappers": "TCP-wrappers", + "research.cs.wisc.edu/condor/license.html#condor": "Condor-1.1", + "research.scea.com/scea_shared_source_license.html": "SCEA", + "romanrm.net/mit-zero": "MIT-0", + "sam.zoy.org/wtfpl/COPYING": "WTFPL", + "scancode-licensedb.aboutcode.org/bsd-unchanged": "BSD-2-Clause-pos-unchanged", + "scripts.sil.org/cms/scripts/page.php?item_id=OFL10_web": "OFL-1.0-no-RFN", + "scripts.sil.org/cms/scripts/page.php?item_id=OFL_web": "OFL-1.1-no-RFN", + "slicer.org/LICENSE": "3D-Slicer-1.0", + "solderpad.org/licenses/SHL-0.5/": "SHL-0.5", + "solderpad.org/licenses/SHL-0.51/": "SHL-0.51", + "source.icu-project.org/repos/icu/icu/trunk/license.html": "ICU", + "sourceforge.net/p/buddy/gitcode/ci/master/tree/README": "Buddy", + "sourceforge.net/p/ctrio/git/ci/master/tree/README": "ISC-Veillard", + "sourceforge.net/p/mcj/xfig/ci/master/tree/src/Makefile.am": "Xfig", + "sourceforge.net/p/netpbm/code/HEAD/tree/super_stable/converter/other/pnmtorle.c": "URT-RLE", + "sourceforge.net/p/netpbm/code/HEAD/tree/super_stable/converter/other/rletopnm.c": "URT-RLE", + "sourceforge.net/p/netpbm/code/HEAD/tree/super_stable/converter/ppm/ppmtompeg/jrevdct.c#l1189": "MPEG-SSG", + "sourceforge.net/p/netpbm/code/HEAD/tree/super_stable/editor/pnmstitch.c#l2": "pnmstitch", + "sourceforge.net/p/netpbm/code/HEAD/tree/super_stable/netpbm.c#l8": "HPND-Pbmplus", + "sourceforge.net/p/sbcl/sbcl/ci/master/tree/src/code/loop.lisp": "LOOP", + "sourceforge.net/p/trustedqsl/tqsl/ci/master/tree/LICENSE.txt": "TrustedQSL", + "sourceforge.net/p/xmedcon/code/ci/master/tree/libs/dicom/README": "OFFIS", + "sourceforge.net/p/xmedcon/code/ci/master/tree/libs/ljpg/": "IJG-short", + "sourceforge.net/projects/sevenzip/files/LZMA%20SDK/": "LZMA-SDK-9.22", + "sources.debian.org/copyright/license/debianutils/4.11.2/": "SMAIL-GPL", + "sources.debian.org/src/openmpi/4.1.0-10/ompi/debuggers/msgq_interface.h/?hl=19#L19": "mpi-permissive", + "sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/licenses/BitTorrent?r1=1.1&r2=1.1.1.1&diff_format=s": "BitTorrent-1.0", + "sourceware.org/bzip2/1.0.5/bzip2-manual-1.0.5.html": "bzip2-1.0.6", + "sourceware.org/cgit/binutils-gdb/tree/include/coff/sym.h#n11": "MIPS", + "sourceware.org/cgit/binutils-gdb/tree/include/coff/symconst.h#n11": "ThirdEye", + "sourceware.org/cgit/valgrind/tree/mpi/libmpiwrap.c": "bzip2-1.0.6", "sourceware.org/git/?p=binutils-gdb.git;a=blob;f=libiberty/strcasecmp.c;h=131d81c2ce7881fa48c363dc5bf5fb302c61ce0b;hb=HEAD": "BSD-4.3RENO", "sourceware.org/git/?p=binutils-gdb.git;a=blob;f=readline/readline/support/wcwidth.c;h=0f5ec995796f4813abbcf4972aec0378ab74722a;hb=HEAD#l55": "HPND-Markus-Kuhn", "sourceware.org/git/?p=bzip2.git;a=blob;f=LICENSE;hb=bzip2-1.0.6": "bzip2-1.0.6",