From 69fa95c0d0218d5e7a22776e0ea742342bd0ff06 Mon Sep 17 00:00:00 2001 From: Marie Date: Fri, 22 Sep 2023 00:26:38 +0200 Subject: [PATCH 1/7] ci: update to sharkey --- .github/workflows/docker-develop.yml | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/.github/workflows/docker-develop.yml b/.github/workflows/docker-develop.yml index 05bb7f77f9..6b432a23f2 100644 --- a/.github/workflows/docker-develop.yml +++ b/.github/workflows/docker-develop.yml @@ -6,11 +6,14 @@ on: - develop workflow_dispatch: +env: + REGISTRY: ghcr.io + jobs: push_to_registry: - name: Push Docker image to Docker Hub + name: Push Docker image to GHCR runs-on: ubuntu-latest - if: github.repository == 'misskey-dev/misskey' + if: github.repository == 'transfem-org/Sharkey' steps: - name: Check out the repo uses: actions/checkout@v4.0.0 @@ -18,18 +21,19 @@ jobs: id: buildx uses: docker/setup-buildx-action@v3.0.0 with: - platforms: linux/amd64,linux/arm64 + platforms: linux/amd64 - name: Docker meta id: meta uses: docker/metadata-action@v5 with: - images: misskey/misskey - - name: Log in to Docker Hub + images: transfem-org/Sharkey + - name: Log in to GHCR uses: docker/login-action@v3 with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - name: Build and Push to Docker Hub + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + - name: Build and Push to GHCR uses: docker/build-push-action@v5 with: builder: ${{ steps.buildx.outputs.name }} @@ -37,7 +41,7 @@ jobs: push: true platforms: ${{ steps.buildx.outputs.platforms }} provenance: false - tags: misskey/misskey:develop + tags: transfem-org/Sharkey:develop labels: develop cache-from: type=gha cache-to: type=gha,mode=max From 1ffd31779369aa9644b19a495f9516ddbabdc907 Mon Sep 17 00:00:00 2001 From: Marie Date: Fri, 22 Sep 2023 00:30:36 +0200 Subject: [PATCH 2/7] fix: lowercase error on ci --- .github/workflows/docker-develop.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-develop.yml b/.github/workflows/docker-develop.yml index 6b432a23f2..eac5ff189d 100644 --- a/.github/workflows/docker-develop.yml +++ b/.github/workflows/docker-develop.yml @@ -26,7 +26,7 @@ jobs: id: meta uses: docker/metadata-action@v5 with: - images: transfem-org/Sharkey + images: transfem-org/sharkey - name: Log in to GHCR uses: docker/login-action@v3 with: @@ -41,7 +41,7 @@ jobs: push: true platforms: ${{ steps.buildx.outputs.platforms }} provenance: false - tags: transfem-org/Sharkey:develop + tags: transfem-org/sharkey:develop labels: develop cache-from: type=gha cache-to: type=gha,mode=max From 0f11e2d523cdae281920d12657f78ed1b125949f Mon Sep 17 00:00:00 2001 From: Amelia Yukii <123300075+Insert5StarName@users.noreply.github.com> Date: Fri, 22 Sep 2023 00:32:37 +0200 Subject: [PATCH 3/7] Update README.md --- README.md | 53 +++++------------------------------------------------ 1 file changed, 5 insertions(+), 48 deletions(-) diff --git a/README.md b/README.md index ab4388c2eb..74397da789 100644 --- a/README.md +++ b/README.md @@ -1,36 +1,21 @@
- Misskey logo + Sharky logo -**🌎 **[Misskey](https://misskey-hub.net/)** is an open source, decentralized social media platform that's free forever! 🚀** +**🌎 **[Sharky](https://misskey-hub.net/)** is an open source, decentralized social media platform that's free forever! 🚀** --- - - find an instance - - - create an instance - - - become a contributor - - - join the community - - - become a patron - + Work In Progress + --- -[![codecov](https://codecov.io/gh/misskey-dev/misskey/branch/develop/graph/badge.svg?token=R6IQZ3QJOL)](https://codecov.io/gh/misskey-dev/misskey) -
- + ## ✨ Features - **ActivityPub support**\ @@ -48,31 +33,3 @@ With Misskey's built in drive, you get cloud storage right in your social media,
- -## Documentation - -Misskey Documentation can be found at [Misskey Hub](https://misskey-hub.net/), some of the links and graphics above also lead to specific portions of it. - -## Sponsors - -
- RSS3 -
- -## Thanks - -Chromatic - -Thanks to [Chromatic](https://www.chromatic.com/) for providing the visual testing platform that helps us review UI changes and catch visual regressions. - -Codecov - -Thanks to [Codecov](https://about.codecov.io/for/open-source/) for providing the code coverage platform that helps us improve our test coverage. - -Crowdin - -Thanks to [Crowdin](https://crowdin.com/) for providing the localization platform that helps us translate Misskey into many languages. - -Docker - -Thanks to [Docker](https://hub.docker.com/) for providing the container platform that helps us run Misskey in production. From 2ec4d70af9fcc31f1af1ebcd4dbdf052f0b034f0 Mon Sep 17 00:00:00 2001 From: Marie Date: Fri, 22 Sep 2023 00:39:30 +0200 Subject: [PATCH 4/7] fix: registry url --- .github/workflows/docker-develop.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-develop.yml b/.github/workflows/docker-develop.yml index eac5ff189d..5156bb4453 100644 --- a/.github/workflows/docker-develop.yml +++ b/.github/workflows/docker-develop.yml @@ -14,6 +14,9 @@ jobs: name: Push Docker image to GHCR runs-on: ubuntu-latest if: github.repository == 'transfem-org/Sharkey' + permissions: + contents: read + packages: write steps: - name: Check out the repo uses: actions/checkout@v4.0.0 @@ -41,7 +44,7 @@ jobs: push: true platforms: ${{ steps.buildx.outputs.platforms }} provenance: false - tags: transfem-org/sharkey:develop + tags: ${{ env.REGISTRY }}/transfem-org/sharkey:develop labels: develop cache-from: type=gha cache-to: type=gha,mode=max From d3333ebb34ea9fb294ce8765f9d1d1b2b0991a2a Mon Sep 17 00:00:00 2001 From: Marie Date: Fri, 22 Sep 2023 00:41:42 +0200 Subject: [PATCH 5/7] forgot to add registry to metadata-action --- .github/workflows/docker-develop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-develop.yml b/.github/workflows/docker-develop.yml index 5156bb4453..2e8093036d 100644 --- a/.github/workflows/docker-develop.yml +++ b/.github/workflows/docker-develop.yml @@ -29,7 +29,7 @@ jobs: id: meta uses: docker/metadata-action@v5 with: - images: transfem-org/sharkey + images: ${{ env.REGISTRY }}/transfem-org/sharkey - name: Log in to GHCR uses: docker/login-action@v3 with: From 91b57f8d8d28b34232e64c016855a55147ea9fce Mon Sep 17 00:00:00 2001 From: Marie Date: Fri, 22 Sep 2023 00:57:08 +0200 Subject: [PATCH 6/7] ci: add auto-updating for develop --- .github/workflows/docker-develop.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/docker-develop.yml b/.github/workflows/docker-develop.yml index 2e8093036d..59e3640330 100644 --- a/.github/workflows/docker-develop.yml +++ b/.github/workflows/docker-develop.yml @@ -48,3 +48,10 @@ jobs: labels: develop cache-from: type=gha cache-to: type=gha,mode=max + - name: Push update to server + if: steps.build.outcome == 'success' + uses: indiesdev/curl@v1.1 + with: + url: ${{ secrets.AUTO_UPDATE_URL }} + method: POST + timeout: 600000 From 15967dd7521efc8193df6b6c55a0421b7ae40bab Mon Sep 17 00:00:00 2001 From: Marie Date: Fri, 22 Sep 2023 00:58:41 +0200 Subject: [PATCH 7/7] ci: add id to build --- .github/workflows/docker-develop.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker-develop.yml b/.github/workflows/docker-develop.yml index 59e3640330..4777c7a0e8 100644 --- a/.github/workflows/docker-develop.yml +++ b/.github/workflows/docker-develop.yml @@ -37,6 +37,7 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - name: Build and Push to GHCR + id: build uses: docker/build-push-action@v5 with: builder: ${{ steps.buildx.outputs.name }}