Просмотр исходного кода

Licence check changes

- Allow ISC license

- Add PSIPHON_ENABLE_INPROXY and PSIPHON_ENABLE_REFRACTION_NETWORKING build
  tags to the test runs, for coverage with those features enabled

- Don't exclude packages with the "non-Go code that can't be inspected"
  warnings, since those warnings don't fail the test and the exclusion could
  mask some sub-dependency
Rod Hynes 1 год назад
Родитель
Сommit
2a564f3eb3
1 измененных файлов с 5 добавлено и 6 удалено
  1. 5 6
      .github/workflows/tests.yml

+ 5 - 6
.github/workflows/tests.yml

@@ -174,17 +174,16 @@ jobs:
       #   GPL 3 license; any dependencies within (subtree or copy) must be
       #   manually vetted
       #
-      # - golang.org/x,filippo.io/edwards25519,github.com/klauspost/compress:
-      #   fail with "contains non-Go code that can't be inspected for further
-      #   dependencies"; manually vetted
-      #
       # - github.com/oschwald/maxminddb-golang,github.com/shoenig/go-m1cpu:
       #   ISC and MPL-2.0 respectively; allowed for server only (there is an
       #   extra pass, without this exclusion, over the main client packages)
       #
+      # - github.com/sergeyfrolov/bsbuffer: is LGPL-3.0, but may be excluded by
+      #   omitting the build tag PSIPHON_ENABLE_REFRACTION_NETWORKING.
+      #
       - name: Check licenses
         if: ${{ matrix.test-type == 'code-vetting' }}
         run: |
           cd ${{ github.workspace }}/go/src/github.com/Psiphon-Labs/psiphon-tunnel-core
-          go run github.com/google/go-licenses@latest check --ignore=github.com/Psiphon-Labs,github.com/Psiphon-Inc,golang.org/x,filippo.io/edwards25519,github.com/klauspost/compress,github.com/oschwald/maxminddb-golang,github.com/shoenig/go-m1cpu --allowed_licenses=Apache-2.0,Apache-3,BSD-2-Clause,BSD-3-Clause,BSD-4-Clause,CC0-1.0,MIT ./...
-          go run github.com/google/go-licenses@latest check --ignore=github.com/Psiphon-Labs,github.com/Psiphon-Inc,golang.org/x,filippo.io/edwards25519,github.com/klauspost/compress --allowed_licenses=Apache-2.0,Apache-3,BSD-2-Clause,BSD-3-Clause,BSD-4-Clause,CC0-1.0,MIT ./psiphon ./psiphon/common/... ./ClientLibrary/... ./ConsoleClient/... ./MobileLibrary/psi
+          GOFLAGS="-tags=PSIPHON_ENABLE_INPROXY,PSIPHON_ENABLE_REFRACTION_NETWORKING" go run github.com/google/go-licenses@latest check --ignore=github.com/Psiphon-Labs,github.com/Psiphon-Inc,github.com/oschwald/maxminddb-golang,github.com/shoenig/go-m1cpu,github.com/sergeyfrolov/bsbuffer --allowed_licenses=Apache-2.0,Apache-3,BSD-2-Clause,BSD-3-Clause,BSD-4-Clause,CC0-1.0,ISC,MIT ./...
+          GOFLAGS="-tags=PSIPHON_ENABLE_INPROXY,PSIPHON_ENABLE_REFRACTION_NETWORKING" go run github.com/google/go-licenses@latest check --ignore=github.com/Psiphon-Labs,github.com/Psiphon-Inc,github.com/sergeyfrolov/bsbuffer --allowed_licenses=Apache-2.0,Apache-3,BSD-2-Clause,BSD-3-Clause,BSD-4-Clause,CC0-1.0,ISC,MIT ./psiphon ./psiphon/common/... ./ClientLibrary/... ./ConsoleClient/... ./MobileLibrary/psi