From 37615772e0d171d80d39defe13efcd9514b300ff Mon Sep 17 00:00:00 2001 From: sugar Date: Sun, 12 Jan 2025 04:27:55 +0100 Subject: [PATCH 1/2] Update action workflows to work for this fork Fixes #31. --- .../workflows/check-misskey-js-version.yml | 4 +- .github/workflows/docker-beta.yml | 52 ------------------ .github/workflows/docker-host.yml | 54 ------------------- .github/workflows/docker-io.yml | 54 ------------------- .github/workflows/dockle.yml | 38 ------------- .github/workflows/labeler.yml | 16 ------ .github/workflows/lint.yml | 4 +- .github/workflows/test-backend.yml | 18 ++----- .github/workflows/test-frontend.yml | 7 +-- .github/workflows/test-misskey-js.yml | 10 +--- .github/workflows/test-production.yml | 4 +- .github/workflows/validate-api-json.yml | 4 +- 12 files changed, 9 insertions(+), 256 deletions(-) delete mode 100644 .github/workflows/docker-beta.yml delete mode 100644 .github/workflows/docker-host.yml delete mode 100644 .github/workflows/docker-io.yml delete mode 100644 .github/workflows/dockle.yml delete mode 100644 .github/workflows/labeler.yml diff --git a/.github/workflows/check-misskey-js-version.yml b/.github/workflows/check-misskey-js-version.yml index 6a70cc0fe..26c4b654b 100644 --- a/.github/workflows/check-misskey-js-version.yml +++ b/.github/workflows/check-misskey-js-version.yml @@ -3,9 +3,7 @@ name: Check Misskey JS version on: push: branches: - - beta - - io - - host + - main paths: - packages/misskey-js/package.json - package.json diff --git a/.github/workflows/docker-beta.yml b/.github/workflows/docker-beta.yml deleted file mode 100644 index 2198ea7d5..000000000 --- a/.github/workflows/docker-beta.yml +++ /dev/null @@ -1,52 +0,0 @@ -name: Publish Docker image (beta) - -on: - push: - branches: - - beta - workflow_dispatch: - -jobs: - push_to_registry: - name: Push Docker image to GitHub Container Registry - runs-on: ubuntu-22.04 - if: github.repository == 'MisskeyIO/misskey' - steps: - - name: Check out the repo - uses: actions/checkout@v4 - with: - fetch-depth: 0 - submodules: true - - name: Set up Docker Buildx - id: buildx - uses: docker/setup-buildx-action@v3 - with: - platforms: linux/amd64 - - name: Docker meta - id: meta - uses: docker/metadata-action@v5 - with: - images: ghcr.io/misskeyio/misskey - - name: Log in to GitHub Container Registry - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - name: Prepare image tags - run: | - echo "FORMATTED_BRANCH_NAME=$(echo ${{ github.ref_name }} | sed -e 's/\//-/g' )" >> $GITHUB_ENV - - name: Build and Push to GitHub Container Registry - uses: docker/build-push-action@v6 - with: - builder: ${{ steps.buildx.outputs.name }} - context: . - push: true - platforms: ${{ steps.buildx.outputs.platforms }} - provenance: false - labels: ${{ env.FORMATTED_BRANCH_NAME }} - cache-from: type=registry,ref=ghcr.io/misskeyio/misskey:io-buildcache - cache-to: type=registry,ref=ghcr.io/misskeyio/misskey:io-buildcache,mode=max - tags: | - ghcr.io/misskeyio/misskey:beta - ghcr.io/misskeyio/misskey:${{ env.FORMATTED_BRANCH_NAME }} diff --git a/.github/workflows/docker-host.yml b/.github/workflows/docker-host.yml deleted file mode 100644 index 80928ff02..000000000 --- a/.github/workflows/docker-host.yml +++ /dev/null @@ -1,54 +0,0 @@ -name: Publish Docker image (host) - -on: - push: - branches: - - host - tags: - - '**-host.*' - workflow_dispatch: - -jobs: - push_to_registry: - name: Push Docker image to GitHub Container Registry - runs-on: ubuntu-22.04 - if: github.repository == 'MisskeyIO/misskey' - steps: - - name: Check out the repo - uses: actions/checkout@v4 - with: - fetch-depth: 0 - submodules: true - - name: Set up Docker Buildx - id: buildx - uses: docker/setup-buildx-action@v3 - with: - platforms: linux/amd64 - - name: Docker meta - id: meta - uses: docker/metadata-action@v5 - with: - images: ghcr.io/misskeyio/misskey - - name: Log in to GitHub Container Registry - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - name: Prepare image tags - run: | - echo "FORMATTED_BRANCH_NAME=$(echo ${{ github.ref_name }} | sed -e 's/\//-/g' )" >> $GITHUB_ENV - - name: Build and Push to GitHub Container Registry - uses: docker/build-push-action@v6 - with: - builder: ${{ steps.buildx.outputs.name }} - context: . - push: true - platforms: ${{ steps.buildx.outputs.platforms }} - provenance: false - labels: ${{ env.FORMATTED_BRANCH_NAME }} - cache-from: type=registry,ref=ghcr.io/misskeyio/misskey:host-buildcache - cache-to: type=registry,ref=ghcr.io/misskeyio/misskey:host-buildcache,mode=max - tags: | - ghcr.io/misskeyio/misskey:host - ghcr.io/misskeyio/misskey:${{ env.FORMATTED_BRANCH_NAME }} diff --git a/.github/workflows/docker-io.yml b/.github/workflows/docker-io.yml deleted file mode 100644 index 578cb56d3..000000000 --- a/.github/workflows/docker-io.yml +++ /dev/null @@ -1,54 +0,0 @@ -name: Publish Docker image (io) - -on: - push: - branches: - - io - tags: - - '**-io.*' - workflow_dispatch: - -jobs: - push_to_registry: - name: Push Docker image to GitHub Container Registry - runs-on: ubuntu-22.04 - if: github.repository == 'MisskeyIO/misskey' - steps: - - name: Check out the repo - uses: actions/checkout@v4 - with: - fetch-depth: 0 - submodules: true - - name: Set up Docker Buildx - id: buildx - uses: docker/setup-buildx-action@v3 - with: - platforms: linux/amd64 - - name: Docker meta - id: meta - uses: docker/metadata-action@v5 - with: - images: ghcr.io/misskeyio/misskey - - name: Log in to GitHub Container Registry - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - name: Prepare image tags - run: | - echo "FORMATTED_BRANCH_NAME=$(echo ${{ github.ref_name }} | sed -e 's/\//-/g' )" >> $GITHUB_ENV - - name: Build and Push to GitHub Container Registry - uses: docker/build-push-action@v6 - with: - builder: ${{ steps.buildx.outputs.name }} - context: . - push: true - platforms: ${{ steps.buildx.outputs.platforms }} - provenance: false - labels: ${{ env.FORMATTED_BRANCH_NAME }} - cache-from: type=registry,ref=ghcr.io/misskeyio/misskey:io-buildcache - cache-to: type=registry,ref=ghcr.io/misskeyio/misskey:io-buildcache,mode=max - tags: | - ghcr.io/misskeyio/misskey:latest - ghcr.io/misskeyio/misskey:${{ env.FORMATTED_BRANCH_NAME }} diff --git a/.github/workflows/dockle.yml b/.github/workflows/dockle.yml deleted file mode 100644 index 39f32557f..000000000 --- a/.github/workflows/dockle.yml +++ /dev/null @@ -1,38 +0,0 @@ -name: Dockle - -on: - push: - branches: - - beta - - io - - host - pull_request: - -jobs: - dockle: - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v4 - with: - fetch-depth: 0 - submodules: true - - name: Build an image from Dockerfile - uses: docker/build-push-action@v6 - with: - context: . - push: false - provenance: false - cache-from: type=registry,ref=ghcr.io/misskeyio/misskey:io-buildcache - tags: | - misskey:scan - - name: Run dockle - uses: docker://goodwithtech/dockle:v0.4.14 - env: - DOCKLE_OUTPUT_FORMAT: list - DOCKLE_EXIT_CODE: 1 - DOCKLE_EXIT_LEVEL: WARN - DOCKLE_IGNORES: CIS-DI-0005,CIS-DI-0010 - DOCKLE_DEBUG: true - with: - args: 'misskey:scan' diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml deleted file mode 100644 index 88e2aceae..000000000 --- a/.github/workflows/labeler.yml +++ /dev/null @@ -1,16 +0,0 @@ -name: "Pull Request Labeler" -on: - pull_request_target: - branches-ignore: - - 'l10n_develop' - -jobs: - triage: - permissions: - contents: read - pull-requests: write - runs-on: ubuntu-latest - steps: - - uses: actions/labeler@v5 - with: - repo-token: "${{ secrets.GITHUB_TOKEN }}" diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 91e318480..b77761e16 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -3,9 +3,7 @@ name: Lint on: push: branches: - - beta - - io - - host + - main paths: - packages/backend/** - packages/frontend/** diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml index 26c352699..842d5d289 100644 --- a/.github/workflows/test-backend.yml +++ b/.github/workflows/test-backend.yml @@ -3,9 +3,7 @@ name: Test (backend) on: push: branches: - - beta - - io - - host + - main paths: - packages/backend/** # for permissions @@ -71,12 +69,7 @@ jobs: - name: Build run: pnpm build - name: Test - run: pnpm --filter backend test-and-coverage - - name: Upload to Codecov - uses: codecov/codecov-action@v5 - with: - token: ${{ secrets.CODECOV_TOKEN }} - files: ./packages/backend/coverage/coverage-final.json + run: pnpm --filter backend test e2e: runs-on: ubuntu-latest @@ -130,9 +123,4 @@ jobs: - name: Build run: pnpm build - name: Test - run: pnpm --filter backend test-and-coverage:e2e - - name: Upload to Codecov - uses: codecov/codecov-action@v5 - with: - token: ${{ secrets.CODECOV_TOKEN }} - files: ./packages/backend/coverage/coverage-final.json + run: pnpm --filter backend test:e2e diff --git a/.github/workflows/test-frontend.yml b/.github/workflows/test-frontend.yml index 53b486e3a..5e8dad486 100644 --- a/.github/workflows/test-frontend.yml +++ b/.github/workflows/test-frontend.yml @@ -51,9 +51,4 @@ jobs: - name: Build run: pnpm build - name: Test - run: pnpm --filter frontend test-and-coverage - - name: Upload Coverage - uses: codecov/codecov-action@v5 - with: - token: ${{ secrets.CODECOV_TOKEN }} - files: ./packages/frontend/coverage/coverage-final.json + run: pnpm --filter frontend test diff --git a/.github/workflows/test-misskey-js.yml b/.github/workflows/test-misskey-js.yml index 7acd72fa1..eb3db8af4 100644 --- a/.github/workflows/test-misskey-js.yml +++ b/.github/workflows/test-misskey-js.yml @@ -6,9 +6,7 @@ name: Test (misskey.js) on: push: branches: - - beta - - io - - host + - main paths: - packages/misskey-js/** pull_request: @@ -56,9 +54,3 @@ jobs: run: pnpm --filter misskey-js test env: CI: true - - - name: Upload Coverage - uses: codecov/codecov-action@v5 - with: - token: ${{ secrets.CODECOV_TOKEN }} - files: ./packages/misskey-js/coverage/coverage-final.json diff --git a/.github/workflows/test-production.yml b/.github/workflows/test-production.yml index dd397b550..0debef5f6 100644 --- a/.github/workflows/test-production.yml +++ b/.github/workflows/test-production.yml @@ -3,9 +3,7 @@ name: Test (production install and build) on: push: branches: - - beta - - io - - host + - main pull_request: env: diff --git a/.github/workflows/validate-api-json.yml b/.github/workflows/validate-api-json.yml index af590fe67..5017a7d42 100644 --- a/.github/workflows/validate-api-json.yml +++ b/.github/workflows/validate-api-json.yml @@ -3,9 +3,7 @@ name: Test (backend) on: push: branches: - - beta - - io - - host + - main paths: - packages/backend/** pull_request: From 33077ed48efbf6a0763e411558c93167de4cb702 Mon Sep 17 00:00:00 2001 From: Caramel Date: Mon, 13 Jan 2025 18:15:07 +0100 Subject: [PATCH 2/2] Rename .github directory to .forgejo Fixes #34. --- .dockerignore | 2 +- {.github => .forgejo}/FUNDING.yml | 0 {.github => .forgejo}/ISSUE_TEMPLATE/01_bug-report.yml | 0 {.github => .forgejo}/ISSUE_TEMPLATE/02_feature-request.yml | 0 {.github => .forgejo}/ISSUE_TEMPLATE/config.yml | 0 {.github => .forgejo}/PULL_REQUEST_TEMPLATE/01_bug.md | 0 {.github => .forgejo}/PULL_REQUEST_TEMPLATE/02_enhance.md | 0 {.github => .forgejo}/PULL_REQUEST_TEMPLATE/03_release.md | 0 {.github => .forgejo}/dependabot.yml | 0 {.github => .forgejo}/labeler.yml | 0 {.github => .forgejo}/misskey/test.yml | 0 {.github => .forgejo}/pull_request_template.md | 0 {.github => .forgejo}/workflows/api-misskey-js.yml | 0 .../workflows/check-misskey-js-version.yml | 0 {.github => .forgejo}/workflows/lint.yml | 0 {.github => .forgejo}/workflows/test-backend.yml | 4 ++-- {.github => .forgejo}/workflows/test-frontend.yml | 2 +- {.github => .forgejo}/workflows/test-misskey-js.yml | 0 {.github => .forgejo}/workflows/test-production.yml | 2 +- {.github => .forgejo}/workflows/validate-api-json.yml | 0 CONTRIBUTING.md | 6 +++--- 21 files changed, 8 insertions(+), 8 deletions(-) rename {.github => .forgejo}/FUNDING.yml (100%) rename {.github => .forgejo}/ISSUE_TEMPLATE/01_bug-report.yml (100%) rename {.github => .forgejo}/ISSUE_TEMPLATE/02_feature-request.yml (100%) rename {.github => .forgejo}/ISSUE_TEMPLATE/config.yml (100%) rename {.github => .forgejo}/PULL_REQUEST_TEMPLATE/01_bug.md (100%) rename {.github => .forgejo}/PULL_REQUEST_TEMPLATE/02_enhance.md (100%) rename {.github => .forgejo}/PULL_REQUEST_TEMPLATE/03_release.md (100%) rename {.github => .forgejo}/dependabot.yml (100%) rename {.github => .forgejo}/labeler.yml (100%) rename {.github => .forgejo}/misskey/test.yml (100%) rename {.github => .forgejo}/pull_request_template.md (100%) rename {.github => .forgejo}/workflows/api-misskey-js.yml (100%) rename {.github => .forgejo}/workflows/check-misskey-js-version.yml (100%) rename {.github => .forgejo}/workflows/lint.yml (100%) rename {.github => .forgejo}/workflows/test-backend.yml (96%) rename {.github => .forgejo}/workflows/test-frontend.yml (95%) rename {.github => .forgejo}/workflows/test-misskey-js.yml (100%) rename {.github => .forgejo}/workflows/test-production.yml (92%) rename {.github => .forgejo}/workflows/validate-api-json.yml (100%) diff --git a/.dockerignore b/.dockerignore index c628b85ec..5ab61d98b 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,7 +1,7 @@ **/.git .autogen -.github +.forgejo .travis .vscode .config diff --git a/.github/FUNDING.yml b/.forgejo/FUNDING.yml similarity index 100% rename from .github/FUNDING.yml rename to .forgejo/FUNDING.yml diff --git a/.github/ISSUE_TEMPLATE/01_bug-report.yml b/.forgejo/ISSUE_TEMPLATE/01_bug-report.yml similarity index 100% rename from .github/ISSUE_TEMPLATE/01_bug-report.yml rename to .forgejo/ISSUE_TEMPLATE/01_bug-report.yml diff --git a/.github/ISSUE_TEMPLATE/02_feature-request.yml b/.forgejo/ISSUE_TEMPLATE/02_feature-request.yml similarity index 100% rename from .github/ISSUE_TEMPLATE/02_feature-request.yml rename to .forgejo/ISSUE_TEMPLATE/02_feature-request.yml diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.forgejo/ISSUE_TEMPLATE/config.yml similarity index 100% rename from .github/ISSUE_TEMPLATE/config.yml rename to .forgejo/ISSUE_TEMPLATE/config.yml diff --git a/.github/PULL_REQUEST_TEMPLATE/01_bug.md b/.forgejo/PULL_REQUEST_TEMPLATE/01_bug.md similarity index 100% rename from .github/PULL_REQUEST_TEMPLATE/01_bug.md rename to .forgejo/PULL_REQUEST_TEMPLATE/01_bug.md diff --git a/.github/PULL_REQUEST_TEMPLATE/02_enhance.md b/.forgejo/PULL_REQUEST_TEMPLATE/02_enhance.md similarity index 100% rename from .github/PULL_REQUEST_TEMPLATE/02_enhance.md rename to .forgejo/PULL_REQUEST_TEMPLATE/02_enhance.md diff --git a/.github/PULL_REQUEST_TEMPLATE/03_release.md b/.forgejo/PULL_REQUEST_TEMPLATE/03_release.md similarity index 100% rename from .github/PULL_REQUEST_TEMPLATE/03_release.md rename to .forgejo/PULL_REQUEST_TEMPLATE/03_release.md diff --git a/.github/dependabot.yml b/.forgejo/dependabot.yml similarity index 100% rename from .github/dependabot.yml rename to .forgejo/dependabot.yml diff --git a/.github/labeler.yml b/.forgejo/labeler.yml similarity index 100% rename from .github/labeler.yml rename to .forgejo/labeler.yml diff --git a/.github/misskey/test.yml b/.forgejo/misskey/test.yml similarity index 100% rename from .github/misskey/test.yml rename to .forgejo/misskey/test.yml diff --git a/.github/pull_request_template.md b/.forgejo/pull_request_template.md similarity index 100% rename from .github/pull_request_template.md rename to .forgejo/pull_request_template.md diff --git a/.github/workflows/api-misskey-js.yml b/.forgejo/workflows/api-misskey-js.yml similarity index 100% rename from .github/workflows/api-misskey-js.yml rename to .forgejo/workflows/api-misskey-js.yml diff --git a/.github/workflows/check-misskey-js-version.yml b/.forgejo/workflows/check-misskey-js-version.yml similarity index 100% rename from .github/workflows/check-misskey-js-version.yml rename to .forgejo/workflows/check-misskey-js-version.yml diff --git a/.github/workflows/lint.yml b/.forgejo/workflows/lint.yml similarity index 100% rename from .github/workflows/lint.yml rename to .forgejo/workflows/lint.yml diff --git a/.github/workflows/test-backend.yml b/.forgejo/workflows/test-backend.yml similarity index 96% rename from .github/workflows/test-backend.yml rename to .forgejo/workflows/test-backend.yml index 842d5d289..0f38bdf06 100644 --- a/.github/workflows/test-backend.yml +++ b/.forgejo/workflows/test-backend.yml @@ -65,7 +65,7 @@ jobs: - name: Check pnpm-lock.yaml run: git diff --exit-code pnpm-lock.yaml - name: Copy Configure - run: cp .github/misskey/test.yml .config + run: cp .forgejo/misskey/test.yml .config - name: Build run: pnpm build - name: Test @@ -119,7 +119,7 @@ jobs: - name: Check pnpm-lock.yaml run: git diff --exit-code pnpm-lock.yaml - name: Copy Configure - run: cp .github/misskey/test.yml .config + run: cp .forgejo/misskey/test.yml .config - name: Build run: pnpm build - name: Test diff --git a/.github/workflows/test-frontend.yml b/.forgejo/workflows/test-frontend.yml similarity index 95% rename from .github/workflows/test-frontend.yml rename to .forgejo/workflows/test-frontend.yml index 5e8dad486..4533cceb7 100644 --- a/.github/workflows/test-frontend.yml +++ b/.forgejo/workflows/test-frontend.yml @@ -47,7 +47,7 @@ jobs: - name: Check pnpm-lock.yaml run: git diff --exit-code pnpm-lock.yaml - name: Copy Configure - run: cp .github/misskey/test.yml .config + run: cp .forgejo/misskey/test.yml .config - name: Build run: pnpm build - name: Test diff --git a/.github/workflows/test-misskey-js.yml b/.forgejo/workflows/test-misskey-js.yml similarity index 100% rename from .github/workflows/test-misskey-js.yml rename to .forgejo/workflows/test-misskey-js.yml diff --git a/.github/workflows/test-production.yml b/.forgejo/workflows/test-production.yml similarity index 92% rename from .github/workflows/test-production.yml rename to .forgejo/workflows/test-production.yml index 0debef5f6..36eede611 100644 --- a/.github/workflows/test-production.yml +++ b/.forgejo/workflows/test-production.yml @@ -35,6 +35,6 @@ jobs: - name: Check pnpm-lock.yaml run: git diff --exit-code pnpm-lock.yaml - name: Copy Configure - run: cp .github/misskey/test.yml .config/default.yml + run: cp .forgejo/misskey/test.yml .config/default.yml - name: Build run: pnpm build diff --git a/.github/workflows/validate-api-json.yml b/.forgejo/workflows/validate-api-json.yml similarity index 100% rename from .github/workflows/validate-api-json.yml rename to .forgejo/workflows/validate-api-json.yml diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index dcb625626..87e8b407a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -161,7 +161,7 @@ pnpm dev ### Run test Create a config file. ``` -cp .github/misskey/test.yml .config/ +cp .forgejo/misskey/test.yml .config/ ``` Prepare DB/Redis for testing. ``` @@ -188,8 +188,8 @@ TODO - `MISSKEY_WEBFINGER_USE_HTTP`: If it's set true, WebFinger requests will be http instead of https, useful for testing federation between servers in localhost. NEVER USE IN PRODUCTION. ## Continuous integration -Misskey uses GitHub Actions for executing automated tests. -Configuration files are located in [`/.github/workflows`](/.github/workflows). +Misskey uses Forgejo Actions for executing automated tests. +Configuration files are located in [`/.forgejo/workflows`](/.forgejo/workflows). ## Vue Misskey uses Vue(v3) as its front-end framework.