Merge pull request 'Update module google.golang.org/grpc to v1.68.0 (forgejo)' (#5969 ) from renovate/forgejo-google.golang.org-grpc-1.x into forgejo

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5969 Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Merge pull request 'fix: extend forgejo_auth_token table (part two)' (#5984 ) from earl-warren/forgejo:wip-forgejo-auth-token into forgejo
2024-11-16 12:25:41 +00:00 · 2024-11-16 11:56:02 +00:00 · 2024-11-16 10:53:46 +01:00 · 2024-11-16 03:07:17 +00:00 · 2024-11-16 02:23:37 +00:00 · 2024-11-16 00:34:34 +00:00
8 changed files with 31 additions and 31 deletions
--- a/.forgejo/workflows/testing.yml
+++ b/.forgejo/workflows/testing.yml
@ -122,12 +122,12 @@ jobs:
          USE_REPO_TEST_DIR: 1
          PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
          CHANGED_FILES: ${{steps.changed-files.outputs.all_changed_files}}
-      - name: Upload screenshots on failure
+      - name: Upload test artifacts on failure
        if: failure()
        uses: https://code.forgejo.org/forgejo/upload-artifact@v4
        with:
-          name: screenshots.zip
-          path: /workspace/forgejo/forgejo/tests/e2e/test-artifacts/*/*.png
+          name: test-artifacts.zip
+          path: tests/e2e/test-artifacts/
          retention-days: 3
  test-remote-cacher:
    if: vars.ROLE == 'forgejo-coding' || vars.ROLE == 'forgejo-testing'
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@ -8,7 +8,7 @@ The release notes of each release [are available in the corresponding milestone]

 ## 9.0.2

-The Forgejo v9.0.2 release notes are [available in the v9.0.2 milestone](https://codeberg.org/forgejo/forgejo/milestone/8610.
+The Forgejo v9.0.2 release notes are [available in the v9.0.2 milestone](https://codeberg.org/forgejo/forgejo/milestone/8610).

 ## 9.0.1

--- a/go.mod
+++ b/go.mod
@ -107,7 +107,7 @@ require (
 	golang.org/x/sys v0.27.0
 	golang.org/x/text v0.20.0
 	golang.org/x/tools v0.26.0
-	google.golang.org/grpc v1.67.1
+	google.golang.org/grpc v1.68.0
 	google.golang.org/protobuf v1.35.1
 	gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
 	gopkg.in/ini.v1 v1.67.0
@ -283,7 +283,7 @@ require (
 	golang.org/x/mod v0.21.0 // indirect
 	golang.org/x/sync v0.9.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
@ -297,4 +297,4 @@ replace github.com/nektos/act => code.forgejo.org/forgejo/act v1.22.0

 replace github.com/mholt/archiver/v3 => code.forgejo.org/forgejo/archiver/v3 v3.5.1

-replace github.com/goccy/go-json => github.com/grafana/go-json v0.0.0-20241106155216-71a03f133f5c
+replace github.com/goccy/go-json => github.com/grafana/go-json v0.0.0-20241115232854-f14426c40ff2
--- a/go.sum
+++ b/go.sum
@ -381,8 +381,8 @@ github.com/gorilla/securecookie v1.1.2 h1:YCIWL56dvtr73r6715mJs5ZvhtnY73hBvEF8kX
 github.com/gorilla/securecookie v1.1.2/go.mod h1:NfCASbcHqRSY+3a8tlWJwsQap2VX5pwzwo4h3eOamfo=
 github.com/gorilla/sessions v1.4.0 h1:kpIYOp/oi6MG/p5PgxApU8srsSw9tuFbt46Lt7auzqQ=
 github.com/gorilla/sessions v1.4.0/go.mod h1:FLWm50oby91+hl7p/wRxDth9bWSuk0qVL2emc7lT5ik=
-github.com/grafana/go-json v0.0.0-20241106155216-71a03f133f5c h1:yKBKEC347YZpgii1KazRCfxHsTaxMqWZzoivM1OTT50=
-github.com/grafana/go-json v0.0.0-20241106155216-71a03f133f5c/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
+github.com/grafana/go-json v0.0.0-20241115232854-f14426c40ff2 h1:8xGrYqQ1GM4aaMk7pNDfecBdL/VGhEbpvvGBoqO6BIY=
+github.com/grafana/go-json v0.0.0-20241115232854-f14426c40ff2/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
 github.com/h2non/gock v1.2.0 h1:K6ol8rfrRkUOefooBC8elXoaNGYkpp7y2qcxGG6BzUE=
 github.com/h2non/gock v1.2.0/go.mod h1:tNhoxHYW2W42cYkYb1WqzdbYIieALC99kpYr7rH/BQk=
 github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542 h1:2VTzZjLZBgl62/EtslCrtky5vbi9dd7HrQPQIx6wqiw=
@ -843,10 +843,10 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 h1:e7S5W7MGGLaSu8j3YjdezkZ+m1/Nm0uRVRMEMGk26Xs=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
-google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E=
-google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 h1:pPJltXNxVzT4pK9yD8vR9X75DaWYYmLGMsEvBfFQZzQ=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
+google.golang.org/grpc v1.68.0 h1:aHQeeJbo8zAkAa3pRzrVjZlbz6uSfeOXlJNQM0RAbz0=
+google.golang.org/grpc v1.68.0/go.mod h1:fmSPC5AsjSBCK54MyHRx48kpOti1/jRfOlwEWywNjWA=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
--- a/models/auth/auth_token.go
+++ b/models/auth/auth_token.go
@ -39,7 +39,7 @@ type AuthorizationToken struct {
 	UID             int64  `xorm:"INDEX"`
 	LookupKey       string `xorm:"INDEX UNIQUE"`
 	HashedValidator string
-	Purpose         AuthorizationPurpose `xorm:"NOT NULL"`
+	Purpose         AuthorizationPurpose `xorm:"NOT NULL DEFAULT 'long_term_authorization'"`
 	Expiry          timeutil.TimeStamp
 }

--- a/models/forgejo_migrations/v24.go
+++ b/models/forgejo_migrations/v24.go
@ -8,7 +8,7 @@ import "xorm.io/xorm"
 func AddPurposeToForgejoAuthToken(x *xorm.Engine) error {
 	type ForgejoAuthToken struct {
 		ID      int64  `xorm:"pk autoincr"`
-		Purpose string `xorm:"NOT NULL"`
+		Purpose string `xorm:"NOT NULL DEFAULT 'long_term_authorization'"`
 	}
 	if err := x.Sync(new(ForgejoAuthToken)); err != nil {
 		return err
--- a/package-lock.json
+++ b/package-lock.json
@ -43,7 +43,7 @@
        "pretty-ms": "9.0.0",
        "sortablejs": "1.15.3",
        "swagger-ui-dist": "5.17.14",
-        "tailwindcss": "3.4.13",
+        "tailwindcss": "3.4.15",
        "throttle-debounce": "5.0.0",
        "tinycolor2": "1.6.0",
        "tippy.js": "6.3.7",
@ -15389,33 +15389,33 @@
      }
    },
    "node_modules/tailwindcss": {
-      "version": "3.4.13",
-      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.13.tgz",
-      "integrity": "sha512-KqjHOJKogOUt5Bs752ykCeiwvi0fKVkr5oqsFNt/8px/tA8scFPIlkygsf6jXrfCqGHz7VflA6+yytWuM+XhFw==",
+      "version": "3.4.15",
+      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.15.tgz",
+      "integrity": "sha512-r4MeXnfBmSOuKUWmXe6h2CcyfzJCEk4F0pptO5jlnYSIViUkVmsawj80N5h2lO3gwcmSb4n3PuN+e+GC1Guylw==",
      "license": "MIT",
      "dependencies": {
        "@alloc/quick-lru": "^5.2.0",
        "arg": "^5.0.2",
-        "chokidar": "^3.5.3",
+        "chokidar": "^3.6.0",
        "didyoumean": "^1.2.2",
        "dlv": "^1.1.3",
-        "fast-glob": "^3.3.0",
+        "fast-glob": "^3.3.2",
        "glob-parent": "^6.0.2",
        "is-glob": "^4.0.3",
-        "jiti": "^1.21.0",
+        "jiti": "^1.21.6",
        "lilconfig": "^2.1.0",
-        "micromatch": "^4.0.5",
+        "micromatch": "^4.0.8",
        "normalize-path": "^3.0.0",
        "object-hash": "^3.0.0",
-        "picocolors": "^1.0.0",
-        "postcss": "^8.4.23",
+        "picocolors": "^1.1.1",
+        "postcss": "^8.4.47",
        "postcss-import": "^15.1.0",
        "postcss-js": "^4.0.1",
-        "postcss-load-config": "^4.0.1",
-        "postcss-nested": "^6.0.1",
-        "postcss-selector-parser": "^6.0.11",
-        "resolve": "^1.22.2",
-        "sucrase": "^3.32.0"
+        "postcss-load-config": "^4.0.2",
+        "postcss-nested": "^6.2.0",
+        "postcss-selector-parser": "^6.1.2",
+        "resolve": "^1.22.8",
+        "sucrase": "^3.35.0"
      },
      "bin": {
        "tailwind": "lib/cli.js",
--- a/package.json
+++ b/package.json
@ -42,7 +42,7 @@
    "pretty-ms": "9.0.0",
    "sortablejs": "1.15.3",
    "swagger-ui-dist": "5.17.14",
-    "tailwindcss": "3.4.13",
+    "tailwindcss": "3.4.15",
    "throttle-debounce": "5.0.0",
    "tinycolor2": "1.6.0",
    "tippy.js": "6.3.7",
Author	SHA1	Message	Date
Gusted	6d0f2c1b82	Merge pull request 'Update module google.golang.org/grpc to v1.68.0 (forgejo)' (#5969 ) from renovate/forgejo-google.golang.org-grpc-1.x into forgejo Some checks failed testing / backend-checks (push) Has been cancelled Details testing / frontend-checks (push) Has been cancelled Details testing / test-unit (push) Has been cancelled Details testing / test-e2e (push) Has been cancelled Details testing / test-remote-cacher (redis) (push) Has been cancelled Details testing / test-remote-cacher (valkey) (push) Has been cancelled Details testing / test-remote-cacher (garnet) (push) Has been cancelled Details testing / test-remote-cacher (redict) (push) Has been cancelled Details testing / test-mysql (push) Has been cancelled Details testing / test-pgsql (push) Has been cancelled Details testing / test-sqlite (push) Has been cancelled Details testing / security-check (push) Has been cancelled Details / release (push) Has been cancelled Details Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5969 Reviewed-by: Gusted <gusted@noreply.codeberg.org>	2024-11-16 12:25:41 +00:00
Earl Warren	356aa6521b	Merge pull request 'fix: extend `forgejo_auth_token` table (part two)' (#5984 ) from earl-warren/forgejo:wip-forgejo-auth-token into forgejo Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5984 Reviewed-by: Gusted <gusted@noreply.codeberg.org>	2024-11-16 11:56:02 +00:00
Earl Warren	cf323a3d55	fix: extend `forgejo_auth_token` table (part two) Add the default value of the purpose field to both the table and the migration. The table in v9 and v7 backport already have the default value. ALTER TABLE `forgejo_auth_token` ADD `purpose` TEXT NOT NULL [] - Cannot add a NOT NULL column with default value NULL	2024-11-16 10:53:46 +01:00
Gusted	6bab3c374c	Merge pull request 'Update github.com/grafana/go-json digest to f14426c (forgejo)' (#5980 ) from renovate/forgejo-github.com-grafana-go-json-digest into forgejo Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5980 Reviewed-by: Gusted <gusted@noreply.codeberg.org>	2024-11-16 03:07:17 +00:00
Gusted	570e8cec9e	Merge pull request 'Update dependency tailwindcss to v3.4.15 (forgejo)' (#5966 ) from renovate/forgejo-tailwindcss-3.x into forgejo Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5966 Reviewed-by: Michael Kriese <michael.kriese@gmx.de>	2024-11-16 02:23:37 +00:00
Michael Kriese	bf810fa8d3	Merge pull request 'ci: upload all e2e artifacts' (#5973 ) from viceice/ci/e2e-artifacts into forgejo Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5973	2024-11-16 00:34:34 +00:00
Renovate Bot	66dfb2813c	Update github.com/grafana/go-json digest to f14426c	2024-11-16 00:03:23 +00:00
Earl Warren	95a8987844	Merge pull request 'chore(release-notes): fix the v9.0.2 links' (#5978 ) from earl-warren/forgejo:wip-release-notes into forgejo Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5978 Reviewed-by: Michael Kriese <michael.kriese@gmx.de>	2024-11-15 22:48:55 +00:00
Earl Warren	9fd2df6e30	chore(release-notes): fix the v9.0.2 links	2024-11-15 22:59:52 +01:00
Michael Kriese	5406310f3e	ci: upload all e2e artifacts	2024-11-15 15:01:39 +01:00
Renovate Bot	cdc38ace39	Update module google.golang.org/grpc to v1.68.0	2024-11-15 02:03:08 +00:00
Renovate Bot	4043377377	Update dependency tailwindcss to v3.4.15	2024-11-15 00:09:10 +00:00