From 6ae37185741cc680ce14142d56062340d9e0eab8 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 6 Mar 2024 04:38:27 +0000 Subject: [PATCH 01/10] fix(deps): update module golang.org/x/term to v0.18.0 (#630) Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- go.mod | 4 ++-- go.sum | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index efa3dca..1f6bb18 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/stretchr/testify v1.8.4 github.com/urfave/cli/v2 v2.25.7 golang.org/x/crypto v0.19.0 - golang.org/x/term v0.17.0 + golang.org/x/term v0.18.0 gopkg.in/yaml.v3 v3.0.1 ) @@ -65,7 +65,7 @@ require ( github.com/yuin/goldmark-emoji v1.0.1 // indirect golang.org/x/mod v0.12.0 // indirect golang.org/x/net v0.19.0 // indirect - golang.org/x/sys v0.17.0 // indirect + golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/tools v0.13.0 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect diff --git a/go.sum b/go.sum index b23bbb4..f5309c4 100644 --- a/go.sum +++ b/go.sum @@ -246,6 +246,8 @@ golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= +golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= @@ -264,6 +266,8 @@ golang.org/x/term v0.16.0 h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE= golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY= golang.org/x/term v0.17.0 h1:mkTF7LCd6WGJNL3K1Ad7kwxNfYAW6a8a8QqtMblp/4U= golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= +golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8= +golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= From 4fedaaafe1d7d92182a4c28330ad3a7dec023697 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 7 Mar 2024 04:04:35 +0000 Subject: [PATCH 02/10] fix(deps): update module golang.org/x/crypto to v0.21.0 (#627) Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- go.mod | 4 ++-- go.sum | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 1f6bb18..bd622b3 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 github.com/stretchr/testify v1.8.4 github.com/urfave/cli/v2 v2.25.7 - golang.org/x/crypto v0.19.0 + golang.org/x/crypto v0.21.0 golang.org/x/term v0.18.0 gopkg.in/yaml.v3 v3.0.1 ) @@ -64,7 +64,7 @@ require ( github.com/yuin/goldmark v1.5.2 // indirect github.com/yuin/goldmark-emoji v1.0.1 // indirect golang.org/x/mod v0.12.0 // indirect - golang.org/x/net v0.19.0 // indirect + golang.org/x/net v0.21.0 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/tools v0.13.0 // indirect diff --git a/go.sum b/go.sum index f5309c4..adba1b6 100644 --- a/go.sum +++ b/go.sum @@ -188,6 +188,8 @@ golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc= golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo= golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= +golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= +golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= @@ -210,6 +212,8 @@ golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= +golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= +golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= From 36672485d1258f412d43c31488a690088daed8a1 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sun, 7 Apr 2024 03:30:46 +0000 Subject: [PATCH 03/10] Fix license wrong declare. This project is created by Gitea itself, the license is a copy typo (#640) Reviewed-on: https://gitea.com/gitea/tea/pulls/640 --- LICENSE | 1 - 1 file changed, 1 deletion(-) diff --git a/LICENSE b/LICENSE index a8d4b49..f4b69a7 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,4 @@ Copyright (c) 2016 The Gitea Authors -Copyright (c) 2015 The Gogs Authors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From b1b31da7c8706c782620b01afe9c8f4f515ea404 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Mon, 8 Apr 2024 16:34:15 +0000 Subject: [PATCH 04/10] Update .goreleaser.yaml --- .goreleaser.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 8feeb4c..fbe61f5 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -96,10 +96,6 @@ checksum: extra_files: - glob: ./**.xz -env_files: - # override gitea actions which passes GITHUB_TOKEN to set env var as null - github_token: /dev/null - signs: - signature: "${artifact}.sig" From 16a359447422858034291768f445a289a8961ec4 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Mon, 8 Apr 2024 16:37:08 +0000 Subject: [PATCH 05/10] Update .goreleaser.yaml --- .goreleaser.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index fbe61f5..e5fc422 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -96,6 +96,8 @@ checksum: extra_files: - glob: ./**.xz +force_token: gitea + signs: - signature: "${artifact}.sig" From 218b9910699e6ac714c295f9ee83337f34ae5947 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Mon, 8 Apr 2024 16:41:04 +0000 Subject: [PATCH 06/10] shorter actions path --- .gitea/workflows/release-nightly.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/release-nightly.yml b/.gitea/workflows/release-nightly.yml index 66d93e8..b1cc6f3 100644 --- a/.gitea/workflows/release-nightly.yml +++ b/.gitea/workflows/release-nightly.yml @@ -12,18 +12,17 @@ jobs: with: fetch-depth: 0 - run: git fetch --force --tags - - name: setup go - uses: https://github.com/actions/setup-go@v5 + - uses: actions/setup-go@v5 with: go-version: '>=1.20.1' - name: import gpg id: import_gpg - uses: https://github.com/crazy-max/ghaction-import-gpg@v6 + uses: crazy-max/ghaction-import-gpg@v6 with: gpg_private_key: ${{ secrets.GPGSIGN_KEY }} passphrase: ${{ secrets.GPGSIGN_PASSPHRASE }} - name: goreleaser - uses: https://github.com/goreleaser/goreleaser-action@v5 + uses: goreleaser/goreleaser-action@v5 with: distribution: goreleaser-pro version: latest @@ -39,8 +38,6 @@ jobs: GPGSIGN_PASSPHRASE: ${{ secrets.GPGSIGN_PASSPHRASE }} release-image: runs-on: ubuntu-latest - container: - image: catthehacker/ubuntu:act-latest env: DOCKER_ORG: gitea DOCKER_LATEST: nightly From 1e3043ce6faaf1ba328e49572b7644e48c5e23ed Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Mon, 8 Apr 2024 16:42:23 +0000 Subject: [PATCH 07/10] Update .gitea/workflows/release-nightly.yml --- .gitea/workflows/release-nightly.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/release-nightly.yml b/.gitea/workflows/release-nightly.yml index b1cc6f3..a6fbe21 100644 --- a/.gitea/workflows/release-nightly.yml +++ b/.gitea/workflows/release-nightly.yml @@ -36,6 +36,7 @@ jobs: S3_BUCKET: ${{ secrets.AWS_BUCKET }} GPG_FINGERPRINT: ${{ steps.import_gpg.outputs.fingerprint }} GPGSIGN_PASSPHRASE: ${{ secrets.GPGSIGN_PASSPHRASE }} + GITEA_TOKEN: ${{ secrets.GITHUB_TOKEN }} release-image: runs-on: ubuntu-latest env: From 75a7d4b7ccc0585f09d4f7fe8de7c6599605dfb0 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Mon, 8 Apr 2024 16:43:59 +0000 Subject: [PATCH 08/10] Update .gitea/workflows/release-tag.yml --- .gitea/workflows/release-tag.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/release-tag.yml b/.gitea/workflows/release-tag.yml index aac6619..a236d3b 100644 --- a/.gitea/workflows/release-tag.yml +++ b/.gitea/workflows/release-tag.yml @@ -13,19 +13,18 @@ jobs: with: fetch-depth: 0 - run: git fetch --force --tags - - name: setup go - uses: https://github.com/actions/setup-go@v5 + - uses: actions/setup-go@v5 with: - go-version: '>=1.20.1' + go-version-file: 'go.mod' - name: import gpg id: import_gpg - uses: https://github.com/crazy-max/ghaction-import-gpg@v6 + uses: crazy-max/ghaction-import-gpg@v6 with: gpg_private_key: ${{ secrets.GPGSIGN_KEY }} passphrase: ${{ secrets.GPGSIGN_PASSPHRASE }} fingerprint: CC64B1DB67ABBEECAB24B6455FC346329753F4B0 - name: goreleaser - uses: https://github.com/goreleaser/goreleaser-action@v5 + uses: goreleaser/goreleaser-action@v5 with: distribution: goreleaser-pro version: latest From 48d2997a635d0b7aa7db0ea9c7340f5616532f08 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Mon, 8 Apr 2024 16:45:05 +0000 Subject: [PATCH 09/10] Update .gitea/workflows/test-pr.yml --- .gitea/workflows/test-pr.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/test-pr.yml b/.gitea/workflows/test-pr.yml index 94a3682..c52e301 100644 --- a/.gitea/workflows/test-pr.yml +++ b/.gitea/workflows/test-pr.yml @@ -9,10 +9,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: setup go - uses: https://github.com/actions/setup-go@v5 + - uses: actions/setup-go@v5 with: - go-version: '>=1.20.1' + go-version-file: 'go.mod' - name: lint and build run: | make clean From 5236a89d4c598fc531ce8fed9188b265790d2ca2 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Mon, 8 Apr 2024 16:45:15 +0000 Subject: [PATCH 10/10] Update .gitea/workflows/test-pr.yml --- .gitea/workflows/test-pr.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitea/workflows/test-pr.yml b/.gitea/workflows/test-pr.yml index c52e301..b552f0a 100644 --- a/.gitea/workflows/test-pr.yml +++ b/.gitea/workflows/test-pr.yml @@ -1,7 +1,6 @@ name: check-and-test -on: - - push +on: - pull_request jobs: