From 88ff5d6f1411cb4a9e6efc6d95d2dca9e5a41433 Mon Sep 17 00:00:00 2001 From: aeneasr <3372410+aeneasr@users.noreply.github.com> Date: Mon, 30 Dec 2024 10:42:11 +0100 Subject: [PATCH 1/7] chore: add license checker --- .github/workflows/licenses.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/licenses.yml b/.github/workflows/licenses.yml index 6fb85398..46c69da6 100644 --- a/.github/workflows/licenses.yml +++ b/.github/workflows/licenses.yml @@ -1,4 +1,4 @@ -name: Licenses +name: Check licenses on: pull_request: @@ -11,11 +11,8 @@ jobs: check: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-go@v2 + - name: Check licenses + uses: ory/ci/check-licenses@master with: - go-version: "1.23.2" - - uses: actions/setup-node@v2 - with: - node-version: "18" - - run: make licenses + token: ${{ secrets.ORY_BOT_PAT || secrets.GITHUB_TOKEN }} + write_if_match: ${{ github.ref == 'refs/heads/add-license-check' || github.ref == 'refs/heads/main' }} From e45ef68d51419127321926868a2921599bf81e8c Mon Sep 17 00:00:00 2001 From: aeneasr <3372410+aeneasr@users.noreply.github.com> Date: Mon, 30 Dec 2024 10:45:34 +0100 Subject: [PATCH 2/7] chore: synchronize workspaces --- .github/workflows/licenses.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/licenses.yml b/.github/workflows/licenses.yml index 46c69da6..69877000 100644 --- a/.github/workflows/licenses.yml +++ b/.github/workflows/licenses.yml @@ -15,4 +15,4 @@ jobs: uses: ory/ci/check-licenses@master with: token: ${{ secrets.ORY_BOT_PAT || secrets.GITHUB_TOKEN }} - write_if_match: ${{ github.ref == 'refs/heads/add-license-check' || github.ref == 'refs/heads/main' }} + write_if_match: "github.ref == 'refs/heads/add-license-check' || github.ref == 'refs/heads/main'" From e0848c88bd3981911b95b286facbfa162e6d432e Mon Sep 17 00:00:00 2001 From: aeneasr <3372410+aeneasr@users.noreply.github.com> Date: Mon, 30 Dec 2024 10:59:01 +0100 Subject: [PATCH 3/7] chore: synchronize workspaces --- .github/workflows/licenses.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/licenses.yml b/.github/workflows/licenses.yml index 69877000..5c2c8d7f 100644 --- a/.github/workflows/licenses.yml +++ b/.github/workflows/licenses.yml @@ -12,7 +12,15 @@ jobs: runs-on: ubuntu-latest steps: - name: Check licenses - uses: ory/ci/check-licenses@master + uses: ory/ci/licenses/setup@master + with: + token: ${{ secrets.ORY_BOT_PAT || secrets.GITHUB_TOKEN }} + - name: Check licenses + uses: ory/ci/licenses/check@master + with: + token: ${{ secrets.ORY_BOT_PAT || secrets.GITHUB_TOKEN }} + + - name: Check licenses + uses: ory/ci/licenses/check@master with: token: ${{ secrets.ORY_BOT_PAT || secrets.GITHUB_TOKEN }} - write_if_match: "github.ref == 'refs/heads/add-license-check' || github.ref == 'refs/heads/main'" From 9cb788b7e0ff2e18949e11bf0fd5fcc68a4060e6 Mon Sep 17 00:00:00 2001 From: aeneasr <3372410+aeneasr@users.noreply.github.com> Date: Mon, 30 Dec 2024 10:59:20 +0100 Subject: [PATCH 4/7] chore: synchronize workspaces --- .github/workflows/licenses.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/licenses.yml b/.github/workflows/licenses.yml index 5c2c8d7f..87f36858 100644 --- a/.github/workflows/licenses.yml +++ b/.github/workflows/licenses.yml @@ -17,10 +17,5 @@ jobs: token: ${{ secrets.ORY_BOT_PAT || secrets.GITHUB_TOKEN }} - name: Check licenses uses: ory/ci/licenses/check@master - with: - token: ${{ secrets.ORY_BOT_PAT || secrets.GITHUB_TOKEN }} - - - name: Check licenses - uses: ory/ci/licenses/check@master - with: - token: ${{ secrets.ORY_BOT_PAT || secrets.GITHUB_TOKEN }} + - name: Write licenses + uses: ory/ci/licenses/write@master From bc5b2a4a003e7a14c073cf9380f607755826375e Mon Sep 17 00:00:00 2001 From: aeneasr <3372410+aeneasr@users.noreply.github.com> Date: Mon, 30 Dec 2024 11:12:15 +0100 Subject: [PATCH 5/7] chore: synchronize workspaces --- .github/workflows/licenses.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/licenses.yml b/.github/workflows/licenses.yml index 87f36858..7620a709 100644 --- a/.github/workflows/licenses.yml +++ b/.github/workflows/licenses.yml @@ -11,7 +11,7 @@ jobs: check: runs-on: ubuntu-latest steps: - - name: Check licenses + - name: Setup licenses uses: ory/ci/licenses/setup@master with: token: ${{ secrets.ORY_BOT_PAT || secrets.GITHUB_TOKEN }} From c1c6317a687b02f43892af6acce5f93503af1fe5 Mon Sep 17 00:00:00 2001 From: aeneasr <3372410+aeneasr@users.noreply.github.com> Date: Mon, 30 Dec 2024 12:02:30 +0100 Subject: [PATCH 6/7] feat: add license checker to all repos --- .github/workflows/licenses.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/licenses.yml b/.github/workflows/licenses.yml index 7620a709..cba04361 100644 --- a/.github/workflows/licenses.yml +++ b/.github/workflows/licenses.yml @@ -1,4 +1,4 @@ -name: Check licenses +name: Licenses on: pull_request: @@ -11,7 +11,7 @@ jobs: check: runs-on: ubuntu-latest steps: - - name: Setup licenses + - name: Install script uses: ory/ci/licenses/setup@master with: token: ${{ secrets.ORY_BOT_PAT || secrets.GITHUB_TOKEN }} From 559254a476ea8c3602d1de16c92f550a7c9e9014 Mon Sep 17 00:00:00 2001 From: aeneasr <3372410+aeneasr@users.noreply.github.com> Date: Mon, 30 Dec 2024 12:23:49 +0100 Subject: [PATCH 7/7] chore: synchronize workspaces --- go.mod | 1 - go.sum | 2 -- go_mod_indirect_pins.go | 1 - 3 files changed, 4 deletions(-) diff --git a/go.mod b/go.mod index 717100a3..e3968f8d 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,6 @@ require ( github.com/fatih/structs v1.1.0 github.com/fsnotify/fsnotify v1.6.0 github.com/ghodss/yaml v1.0.0 - github.com/go-bindata/go-bindata v3.1.2+incompatible github.com/go-jose/go-jose/v3 v3.0.3 github.com/go-openapi/jsonpointer v0.19.5 github.com/go-openapi/runtime v0.24.2 diff --git a/go.sum b/go.sum index c46ef4de..5a5a53bd 100644 --- a/go.sum +++ b/go.sum @@ -166,8 +166,6 @@ github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4 github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/go-bindata/go-bindata v3.1.2+incompatible h1:5vjJMVhowQdPzjE1LdxyFF7YFTXg5IgGVW4gBr5IbvE= -github.com/go-bindata/go-bindata v3.1.2+incompatible/go.mod h1:xK8Dsgwmeed+BBsSy2XTopBn/8uK2HWuGSnA11C3Joo= github.com/go-fonts/dejavu v0.1.0 h1:JSajPXURYqpr+Cu8U9bt8K+XcACIHWqWrvWCKyeFmVQ= github.com/go-fonts/dejavu v0.1.0/go.mod h1:4Wt4I4OU2Nq9asgDCteaAaWZOV24E+0/Pwo0gppep4g= github.com/go-fonts/latin-modern v0.2.0 h1:5/Tv1Ek/QCr20C6ZOz15vw3g7GELYL98KWr8Hgo+3vk= diff --git a/go_mod_indirect_pins.go b/go_mod_indirect_pins.go index eea0ca47..79a5ca30 100644 --- a/go_mod_indirect_pins.go +++ b/go_mod_indirect_pins.go @@ -7,7 +7,6 @@ package x import ( - _ "github.com/go-bindata/go-bindata/go-bindata" _ "github.com/golang/mock/mockgen" _ "github.com/gorilla/websocket" _ "github.com/jandelgado/gcov2lcov"