From 36672485d1258f412d43c31488a690088daed8a1 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sun, 7 Apr 2024 03:30:46 +0000 Subject: [PATCH 1/8] 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 2/8] 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 3/8] 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 4/8] 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 5/8] 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 6/8] 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 7/8] 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 8/8] 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: