From c3fb4b38558ff49dcadcbab9cda2ee1558f07b3c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 6 Jul 2023 11:20:31 +0000 Subject: [PATCH 1/5] chore(deps): Bump golang.org/x/tools Bumps [golang.org/x/tools](https://github.com/golang/tools) from 0.10.0 to 0.11.0. - [Release notes](https://github.com/golang/tools/releases) - [Commits](https://github.com/golang/tools/compare/v0.10.0...v0.11.0) --- updated-dependencies: - dependency-name: golang.org/x/tools dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- packages/@jsii/go-runtime-test/project/go.mod | 8 +++++--- packages/@jsii/go-runtime-test/project/go.sum | 12 ++++++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/packages/@jsii/go-runtime-test/project/go.mod b/packages/@jsii/go-runtime-test/project/go.mod index 701abb19c1..7d90bb4191 100644 --- a/packages/@jsii/go-runtime-test/project/go.mod +++ b/packages/@jsii/go-runtime-test/project/go.mod @@ -9,18 +9,20 @@ require ( github.com/aws/jsii/jsii-calc/go/scopejsiicalclib v0.0.0-devpreview github.com/stretchr/testify v1.8.4 golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 - golang.org/x/tools v0.10.0 + golang.org/x/tools v0.11.0 ) require ( github.com/Masterminds/semver/v3 v3.2.1 // indirect github.com/aws/jsii/jsii-calc/go/scopejsiicalcbaseofbase/v2 v2.1.1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect + github.com/fatih/color v1.15.0 // indirect + github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.19 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/yuin/goldmark v1.4.13 // indirect - golang.org/x/mod v0.11.0 // indirect - golang.org/x/sys v0.9.0 // indirect + golang.org/x/mod v0.12.0 // indirect + golang.org/x/sys v0.10.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/packages/@jsii/go-runtime-test/project/go.sum b/packages/@jsii/go-runtime-test/project/go.sum index 0f0cdd6cad..4b0ca938d1 100644 --- a/packages/@jsii/go-runtime-test/project/go.sum +++ b/packages/@jsii/go-runtime-test/project/go.sum @@ -2,6 +2,11 @@ github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0 github.com/Masterminds/semver/v3 v3.2.1/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs= +github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw= +github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= +github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= +github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= @@ -19,6 +24,8 @@ golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk= golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.11.0 h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU= golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc= +golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -26,17 +33,22 @@ golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI= golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s= golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= +golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM= golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc= golang.org/x/tools v0.10.0 h1:tvDr/iQoUqNdohiYm0LmmKcBk+q86lb9EprIUFhHHGg= golang.org/x/tools v0.10.0/go.mod h1:UJwyiVBsOA2uwvK/e5OY3GTpDUJriEd+/YlqAwLPmyM= +golang.org/x/tools v0.11.0 h1:EMCa6U9S2LtZXLAMoWiR/R8dAQFRqbAitmbJ2UKhoi8= +golang.org/x/tools v0.11.0/go.mod h1:anzJrxPjNtfgiYQYirP2CPGzGLxrH2u2QBhn6Bf3qY8= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= From 1ed3c6438fff647aa1513b751ce5495d57cf3a4b Mon Sep 17 00:00:00 2001 From: Momo Kornher Date: Tue, 11 Jul 2023 09:52:21 +0100 Subject: [PATCH 2/5] chore: fix auto-approve token --- .github/workflows/pr-labeler.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-labeler.yml b/.github/workflows/pr-labeler.yml index 7a08037ea7..74988a7e26 100644 --- a/.github/workflows/pr-labeler.yml +++ b/.github/workflows/pr-labeler.yml @@ -19,4 +19,4 @@ jobs: # This workflow is intended to trigger the `auto-approve` workflow by adding a label to the PR # In order for this to happen, it must run as the automation user and not the github-actions bot # It is an intentional limitation by GitHub that the github-actions bot (identified by using `secrets.GITHUB_TOKEN`) cannot trigger other workflows - GITHUB_TOKEN: ${{ secrets.PROJEN_GITHUB_TOKEN }} + GH_TOKEN: ${{ secrets.PROJEN_GITHUB_TOKEN }} From 32cdd42945763526bfa6a49d866a2938935ea211 Mon Sep 17 00:00:00 2001 From: Momo Kornher Date: Tue, 11 Jul 2023 09:55:33 +0100 Subject: [PATCH 3/5] trigger on more types --- .github/workflows/pr-labeler.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pr-labeler.yml b/.github/workflows/pr-labeler.yml index 74988a7e26..6ca9b44c79 100644 --- a/.github/workflows/pr-labeler.yml +++ b/.github/workflows/pr-labeler.yml @@ -3,7 +3,12 @@ name: pr-labeler on: pull_request: - types: [ opened ] + types: + - labeled # Run when labels are updated + - opened # Run when a PR is initially submitted + - ready_for_review # Run when a Draft PR is upgraded PR + - reopened # Run when a PR is re-opened + - synchronize # Run when a PR head branch is updated jobs: auto-approve: From b638565bdbb34dfcfa421ab296734b35c3631671 Mon Sep 17 00:00:00 2001 From: Momo Kornher Date: Tue, 11 Jul 2023 10:04:09 +0100 Subject: [PATCH 4/5] remove in favor of adding labels via dependabot config --- .github/workflows/pr-labeler.yml | 27 --------------------------- 1 file changed, 27 deletions(-) delete mode 100644 .github/workflows/pr-labeler.yml diff --git a/.github/workflows/pr-labeler.yml b/.github/workflows/pr-labeler.yml deleted file mode 100644 index 6ca9b44c79..0000000000 --- a/.github/workflows/pr-labeler.yml +++ /dev/null @@ -1,27 +0,0 @@ -# Apply various labels on PRs - -name: pr-labeler -on: - pull_request: - types: - - labeled # Run when labels are updated - - opened # Run when a PR is initially submitted - - ready_for_review # Run when a Draft PR is upgraded PR - - reopened # Run when a PR is re-opened - - synchronize # Run when a PR head branch is updated - -jobs: - auto-approve: - if: github.event.pull_request.user.login == 'dependabot[bot]' || github.event.pull_request.user.login == 'dependabot-preview[bot]' - runs-on: ubuntu-latest - permissions: - actions: write - issues: write - pull-requests: write - steps: - - run: gh pr edit ${{ github.event.pull_request.number }} --add-label "auto-approve" -R ${{ github.repository }} - env: - # This workflow is intended to trigger the `auto-approve` workflow by adding a label to the PR - # In order for this to happen, it must run as the automation user and not the github-actions bot - # It is an intentional limitation by GitHub that the github-actions bot (identified by using `secrets.GITHUB_TOKEN`) cannot trigger other workflows - GH_TOKEN: ${{ secrets.PROJEN_GITHUB_TOKEN }} From c4dcd235347d4bc28f64f8ff582027be654d6a28 Mon Sep 17 00:00:00 2001 From: Momo Kornher Date: Tue, 11 Jul 2023 10:04:58 +0100 Subject: [PATCH 5/5] Update dependabot.yml --- .github/dependabot.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 219e0227d3..169864cf62 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -8,6 +8,7 @@ updates: labels: - dependencies - language/dotnet + - auto-approve - package-ecosystem: nuget directory: '/packages/@jsii/dotnet-runtime-test/test' @@ -16,6 +17,7 @@ updates: labels: - dependencies - language/dotnet + - auto-approve - package-ecosystem: pip directory: '/packages/@jsii/python-runtime' @@ -24,6 +26,7 @@ updates: labels: - dependencies - language/python + - auto-approve - package-ecosystem: pip directory: '/gh-pages' @@ -32,6 +35,7 @@ updates: labels: - dependencies - language/python + - auto-approve - package-ecosystem: pip directory: '/packages/jsii-pacmak/test/generated-code' @@ -40,6 +44,7 @@ updates: labels: - dependencies - language/python + - auto-approve - package-ecosystem: pip directory: '/packages/jsii-pacmak/lib/targets/python' @@ -48,6 +53,7 @@ updates: labels: - dependencies - language/python + - auto-approve ignore: - dependency-name: "setuptools" @@ -58,6 +64,7 @@ updates: labels: - dependencies - language/go + - auto-approve - package-ecosystem: gomod directory: '/packages/@jsii/go-runtime-test/project' @@ -66,6 +73,7 @@ updates: labels: - dependencies - language/go + - auto-approve ignore: - dependency-name: github.com/aws/jsii-runtime-go - dependency-name: github.com/aws/jsii-runtime-go/* @@ -77,3 +85,4 @@ updates: interval: daily labels: - dependencies + - auto-approve