forked from modrinth/code
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/main' into skin-manager
- Loading branch information
Showing
1,354 changed files
with
155,768 additions
and
19,118 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,3 +13,6 @@ max_line_length = 100 | |
| [*.md] | ||
| max_line_length = off | ||
| trim_trailing_whitespace = false | ||
|
|
||
| [*.rs] | ||
| indent_size = 4 | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| name: daedalus-docker-build | ||
|
|
||
| on: | ||
| push: | ||
| branches: | ||
| - '**' | ||
| paths: | ||
| - .github/workflows/daedalus-docker.yml | ||
| - 'apps/daedalus_client/**' | ||
| pull_request: | ||
| types: [opened, synchronize] | ||
| paths: | ||
| - .github/workflows/daedalus-docker.yml | ||
| - 'apps/daedalus_client/**' | ||
| merge_group: | ||
| types: [checks_requested] | ||
|
|
||
| jobs: | ||
| docker: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v2 | ||
| - name: Fetch docker metadata | ||
| id: docker_meta | ||
| uses: docker/metadata-action@v3 | ||
| with: | ||
| images: ghcr.io/modrinth/daedalus | ||
| - name: Login to GitHub Images | ||
| uses: docker/login-action@v1 | ||
| with: | ||
| registry: ghcr.io | ||
| username: ${{ github.actor }} | ||
| password: ${{ secrets.GITHUB_TOKEN }} | ||
| - name: Build and push | ||
| id: docker_build | ||
| uses: docker/build-push-action@v2 | ||
| with: | ||
| file: ./apps/daedalus_client/Dockerfile | ||
| push: ${{ github.event_name != 'pull_request' }} | ||
| tags: ${{ steps.docker_meta.outputs.tags }} | ||
| labels: ${{ steps.docker_meta.outputs.labels }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| name: Run Meta | ||
|
|
||
| on: | ||
| schedule: | ||
| - cron: '*/5 * * * *' | ||
| workflow_dispatch: | ||
|
|
||
| jobs: | ||
| run-docker: | ||
| if: github.repository_owner == 'modrinth' | ||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - name: Checkout repository | ||
| uses: actions/checkout@v3 | ||
|
|
||
| - name: Log in to GitHub Container Registry | ||
| uses: docker/login-action@v2 | ||
| with: | ||
| registry: ghcr.io | ||
| username: ${{ github.actor }} | ||
| password: ${{ secrets.GITHUB_TOKEN }} | ||
|
|
||
| - name: Pull Docker image from GHCR | ||
| run: docker pull ghcr.io/modrinth/daedalus:main | ||
|
|
||
| - name: Run Docker container | ||
| env: | ||
| BASE_URL: ${{ secrets.BASE_URL }} | ||
| S3_ACCESS_TOKEN: ${{ secrets.S3_ACCESS_TOKEN }} | ||
| S3_SECRET: ${{ secrets.S3_SECRET }} | ||
| S3_URL: ${{ secrets.S3_URL }} | ||
| S3_REGION: ${{ secrets.S3_REGION }} | ||
| S3_BUCKET_NAME: ${{ secrets.S3_BUCKET_NAME }} | ||
| CLOUDFLARE_INTEGRATION: ${{ secrets.CLOUDFLARE_INTEGRATION }} | ||
| CLOUDFLARE_TOKEN: ${{ secrets.CLOUDFLARE_TOKEN }} | ||
| CLOUDFLARE_ZONE_ID: ${{ secrets.CLOUDFLARE_ZONE_ID }} | ||
| run: | | ||
| docker run \ | ||
| --name daedalus \ | ||
| -e RUST_LOG=warn,daedalus_client=trace \ | ||
| -e BASE_URL=$BASE_URL \ | ||
| -e S3_ACCESS_TOKEN=$S3_ACCESS_TOKEN \ | ||
| -e S3_SECRET=$S3_SECRET \ | ||
| -e S3_URL=$S3_URL \ | ||
| -e S3_REGION=$S3_REGION \ | ||
| -e S3_BUCKET_NAME=$S3_BUCKET_NAME \ | ||
| -e CLOUDFLARE_INTEGRATION=$CLOUDFLARE_INTEGRATION \ | ||
| -e CLOUDFLARE_TOKEN=$CLOUDFLARE_TOKEN \ | ||
| -e CLOUDFLARE_ZONE_ID=$CLOUDFLARE_ZONE_ID \ | ||
| ghcr.io/modrinth/daedalus:main |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| name: docker-build | ||
|
|
||
| on: | ||
| push: | ||
| branches: | ||
| - '**' | ||
| paths: | ||
| - .github/workflows/labrinth-docker.yml | ||
| - 'apps/labrinth/**' | ||
| pull_request: | ||
| types: [opened, synchronize] | ||
| paths: | ||
| - .github/workflows/labrinth-docker.yml | ||
| - 'apps/labrinth/**' | ||
| merge_group: | ||
| types: [checks_requested] | ||
|
|
||
| jobs: | ||
| docker: | ||
| runs-on: ubuntu-latest | ||
| defaults: | ||
| run: | ||
| working-directory: ./apps/labrinth | ||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v2 | ||
| - name: Fetch docker metadata | ||
| id: docker_meta | ||
| uses: docker/metadata-action@v3 | ||
| with: | ||
| images: ghcr.io/modrinth/labrinth | ||
| - name: Login to GitHub Images | ||
| uses: docker/login-action@v1 | ||
| with: | ||
| registry: ghcr.io | ||
| username: ${{ github.actor }} | ||
| password: ${{ secrets.GITHUB_TOKEN }} | ||
| - name: Build and push | ||
| id: docker_build | ||
| uses: docker/build-push-action@v2 | ||
| with: | ||
| context: ./apps/labrinth | ||
| push: ${{ github.event_name != 'pull_request' }} | ||
| tags: ${{ steps.docker_meta.outputs.tags }} | ||
| labels: ${{ steps.docker_meta.outputs.labels }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.