Merge branch 'develop' into iceshrimp_mastodon

This commit is contained in:
naskya 2024-06-05 07:00:10 +09:00
commit d22920cdb8
No known key found for this signature in database
GPG key ID: 712D413B3A9FED5C
3 changed files with 31 additions and 19 deletions

View file

@ -25,10 +25,11 @@ workflow:
- when: never - when: never
stages: stages:
- dependency
- test - test
- doc - doc
- build - build
- dependency
- clean
variables: variables:
POSTGRES_DB: 'firefish_db' POSTGRES_DB: 'firefish_db'
@ -304,3 +305,19 @@ renovate:
before_script: [] before_script: []
script: script:
- renovate --platform gitlab --token "${API_TOKEN}" --endpoint "${CI_SERVER_URL}/api/v4" "${CI_PROJECT_PATH}" - renovate --platform gitlab --token "${API_TOKEN}" --endpoint "${CI_SERVER_URL}/api/v4" "${CI_PROJECT_PATH}"
clean:
stage: clean
rules:
- if: $CLEAN && $CI_PIPELINE_SOURCE == 'schedule'
services: []
before_script:
- apt-get update && apt-get -y upgrade
- apt-get -y --no-install-recommends install curl
- curl -fsSL 'https://deb.nodesource.com/setup_18.x' | bash -
- apt-get install -y --no-install-recommends nodejs
- corepack enable
- corepack prepare pnpm@latest --activate
- pnpm install --frozen-lockfile
script:
- pnpm run clean-all

View file

@ -34,11 +34,11 @@
"@redocly/openapi-core": "1.14.0", "@redocly/openapi-core": "1.14.0",
"@sinonjs/fake-timers": "11.2.2", "@sinonjs/fake-timers": "11.2.2",
"adm-zip": "0.5.14", "adm-zip": "0.5.14",
"ajv": "8.15.0", "ajv": "8.16.0",
"archiver": "7.0.1", "archiver": "7.0.1",
"async-lock": "1.4.0", "async-lock": "1.4.0",
"async-mutex": "0.5.0", "async-mutex": "0.5.0",
"aws-sdk": "2.1633.0", "aws-sdk": "2.1634.0",
"axios": "1.7.2", "axios": "1.7.2",
"backend-rs": "workspace:*", "backend-rs": "workspace:*",
"blurhash": "2.0.5", "blurhash": "2.0.5",

View file

@ -79,8 +79,8 @@ importers:
specifier: 0.5.14 specifier: 0.5.14
version: 0.5.14 version: 0.5.14
ajv: ajv:
specifier: 8.15.0 specifier: 8.16.0
version: 8.15.0 version: 8.16.0
archiver: archiver:
specifier: 7.0.1 specifier: 7.0.1
version: 7.0.1 version: 7.0.1
@ -91,8 +91,8 @@ importers:
specifier: 0.5.0 specifier: 0.5.0
version: 0.5.0 version: 0.5.0
aws-sdk: aws-sdk:
specifier: 2.1633.0 specifier: 2.1634.0
version: 2.1633.0 version: 2.1634.0
axios: axios:
specifier: 1.7.2 specifier: 1.7.2
version: 1.7.2 version: 1.7.2
@ -2741,8 +2741,8 @@ packages:
ajv@6.12.6: ajv@6.12.6:
resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==} resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==}
ajv@8.15.0: ajv@8.16.0:
resolution: {integrity: sha512-15BTtQUOsSrmHCy+B4VnAiJAJxJ8IFgu6fcjFQF3jQYZ78nLSQthlFg4ehp+NLIyfvFgOlxNsjKIEhydtFPVHQ==} resolution: {integrity: sha512-F0twR8U1ZU67JIEtekUcLkXkoO5mMMmgGD8sK/xUFzJ805jxHQl92hImFAqqXMyMYjSPOyUPAwHYhB72g5sTXw==}
ansi-colors@4.1.1: ansi-colors@4.1.1:
resolution: {integrity: sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==} resolution: {integrity: sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==}
@ -2890,8 +2890,8 @@ packages:
resolution: {integrity: sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==} resolution: {integrity: sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==}
engines: {node: '>= 0.4'} engines: {node: '>= 0.4'}
aws-sdk@2.1633.0: aws-sdk@2.1634.0:
resolution: {integrity: sha512-9OUTdosQgZO6P6hPyEOUDvm4cymbMB0Qn1etucPql95DHjNyIex3FJOBbeRikU+5Wt9Djgdcr+BqAee2Lv/7iw==} resolution: {integrity: sha512-uSEjzAyGIbfpALzxPYES+hsBK1zuUY/8wSv2mAwijAcQfTMV89jQ4VHI/5KsyyZhDSeS/rV9cn6376KO+HDU2w==}
engines: {node: '>= 10.0.0'} engines: {node: '>= 10.0.0'}
axios@0.24.0: axios@0.24.0:
@ -4324,9 +4324,6 @@ packages:
fast-levenshtein@2.0.6: fast-levenshtein@2.0.6:
resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==} resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==}
fast-uri@2.3.0:
resolution: {integrity: sha512-eel5UKGn369gGEWOqBShmFJWfq/xSJvsgDzgLYC845GneayWvXBf0lJCBn5qTABfewy1ZDPoaR5OZCP+kssfuw==}
fast-xml-parser@4.4.0: fast-xml-parser@4.4.0:
resolution: {integrity: sha512-kLY3jFlwIYwBNDojclKsNAC12sfD6NwW74QB2CoNGPvtVxjliYehVunB3HYyNi+n4Tt1dAcgwYvmKF/Z18flqg==} resolution: {integrity: sha512-kLY3jFlwIYwBNDojclKsNAC12sfD6NwW74QB2CoNGPvtVxjliYehVunB3HYyNi+n4Tt1dAcgwYvmKF/Z18flqg==}
hasBin: true hasBin: true
@ -9904,12 +9901,12 @@ snapshots:
json-schema-traverse: 0.4.1 json-schema-traverse: 0.4.1
uri-js: 4.4.1 uri-js: 4.4.1
ajv@8.15.0: ajv@8.16.0:
dependencies: dependencies:
fast-deep-equal: 3.1.3 fast-deep-equal: 3.1.3
fast-uri: 2.3.0
json-schema-traverse: 1.0.0 json-schema-traverse: 1.0.0
require-from-string: 2.0.2 require-from-string: 2.0.2
uri-js: 4.4.1
ansi-colors@4.1.1: {} ansi-colors@4.1.1: {}
@ -10060,7 +10057,7 @@ snapshots:
dependencies: dependencies:
possible-typed-array-names: 1.0.0 possible-typed-array-names: 1.0.0
aws-sdk@2.1633.0: aws-sdk@2.1634.0:
dependencies: dependencies:
buffer: 4.9.2 buffer: 4.9.2
events: 1.1.1 events: 1.1.1
@ -11670,8 +11667,6 @@ snapshots:
fast-levenshtein@2.0.6: {} fast-levenshtein@2.0.6: {}
fast-uri@2.3.0: {}
fast-xml-parser@4.4.0: fast-xml-parser@4.4.0:
dependencies: dependencies:
strnum: 1.0.5 strnum: 1.0.5