diff --git a/.forgejo/workflows/ci.yaml b/.github/workflows/ci.yaml similarity index 57% rename from .forgejo/workflows/ci.yaml rename to .github/workflows/ci.yaml index 88057d1..9f8caea 100644 --- a/.forgejo/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -5,30 +5,25 @@ on: workflow_dispatch: env: - SERVER_URL: https://git.japan7.bde.enseeiht.fr - REGISTRY: git.japan7.bde.enseeiht.fr + REGISTRY: ghcr.io IMAGE_NAME: japan7/nanapi MAIN_BRANCH: main jobs: check: if: startsWith(github.ref, 'refs/tags/') != true - runs-on: docker - container: - image: ghcr.io/japan7/forgejo-runner-image:3.12 + runs-on: ubuntu-latest steps: - - run: git config --global --add url.http://forgejo-http:3000.insteadOf ssh://git@git.japan7.bde.enseeiht.fr:8022 - uses: actions/checkout@v4 - with: - token: ${{ secrets.FJ_TOKEN }} - - id: cache_env - run: echo "::set-output name=hash::$(cat pyproject.toml poetry.lock | sha256sum | cut -d' ' -f1)" - uses: actions/cache@v4 with: path: ~/.cache/pypoetry - key: ${{ runner.os }}-poetry-${{ steps.cache_env.outputs.hash }} + key: ${{ runner.os }}-poetry-${{ hashFiles('**/pyproject.toml', '**/poetry.lock') }} restore-keys: | ${{ runner.os }}-poetry- + - uses: actions/setup-python@v5 + with: + python-version: "3.12" - name: poetry install run: | poetry install @@ -36,34 +31,28 @@ jobs: - run: poetry run pyright - run: poetry run ruff check nanapi/ if: always() - - uses: Japan7/forgejo-actions-status-discord@main + - uses: sarisia/actions-status-discord@v1 if: failure() with: - server_url: ${{ env.SERVER_URL }} webhook: ${{ secrets.DISCORD_WEBHOOK }} docker-deploy: if: startsWith(github.ref, 'refs/heads/renovate/') != true - runs-on: docker - container: - image: ghcr.io/japan7/forgejo-runner-image:latest + runs-on: ubuntu-latest steps: - - run: git config --global --add url.http://forgejo-http:3000.insteadOf ssh://git@git.japan7.bde.enseeiht.fr:8022 - name: Checkout repository uses: actions/checkout@v4 - with: - token: ${{ secrets.FJ_TOKEN }} - name: Setup Docker buildx uses: docker/setup-buildx-action@v3 - name: Log into registry ${{ env.REGISTRY }} uses: docker/login-action@v3 with: registry: ${{ env.REGISTRY }} - username: ${{ secrets.FJ_USERNAME }} - password: ${{ secrets.FJ_TOKEN }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Extract Docker metadata id: meta - run: .forgejo/workflows/meta.py + run: .github/workflows/meta.py - name: Build and push Docker image id: build-and-push uses: docker/build-push-action@v5 @@ -77,19 +66,18 @@ jobs: cache-to: type=inline - name: Set deploy environment id: deploy_env - run: .forgejo/workflows/deploy_env.py ${{ steps.build-and-push.outputs.digest }} + run: .github/workflows/deploy_env.py ${{ steps.build-and-push.outputs.digest }} - name: Update nanak8s run: | - git clone --depth 1 "https://${{ secrets.GH_USERNAME }}:${{ secrets.GH_TOKEN }}@github.com/Japan7/nanak8s.git" nanak8s + git clone --depth 1 "https://github.com/Japan7/nanak8s.git" nanak8s cd nanak8s/ yq e -i '(.environments.${{ steps.deploy_env.outputs.name }}.values[] | select(has("tag"))).tag = "${{ steps.deploy_env.outputs.tag }}"' apps/nanapi/environments.yaml git add apps/nanapi/environments.yaml - git config user.email "forgejo@japan7.bde.enseeiht.fr" - git config user.name "forgejo-japan7[bot]" - git commit -m "[CI] Update nanapi-${{ steps.deploy_env.outputs.name }} to ${{ steps.deploy_env.outputs.pretty }}" -m "${{ env.SERVER_URL }}/$GITHUB_REPOSITORY/commit/$GITHUB_SHA" + git config user.name 'github-actions[bot]' + git config user.email 'github-actions[bot]@users.noreply.github.com' + git commit -m "[CI] Update nanapi-${{ steps.deploy_env.outputs.name }} to ${{ steps.deploy_env.outputs.pretty }}" -m "https://github.com/$GITHUB_REPOSITORY/commit/$GITHUB_SHA" git push - - uses: Japan7/forgejo-actions-status-discord@main + - uses: sarisia/actions-status-discord@v1 if: failure() with: - server_url: ${{ env.SERVER_URL }} webhook: ${{ secrets.DISCORD_WEBHOOK }} diff --git a/.forgejo/workflows/deploy_env.py b/.github/workflows/deploy_env.py similarity index 100% rename from .forgejo/workflows/deploy_env.py rename to .github/workflows/deploy_env.py diff --git a/.forgejo/workflows/meta.py b/.github/workflows/meta.py similarity index 100% rename from .forgejo/workflows/meta.py rename to .github/workflows/meta.py diff --git a/.vscode/settings.json b/.vscode/settings.json index 361721e..2d3c57a 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,11 +1,6 @@ { "editor.rulers": [99], "python.analysis.typeCheckingMode": "basic", - "yaml.schemas": { - "https://json.schemastore.org/github-workflow.json": [ - ".forgejo/workflows/*" - ] - }, "[edgeql]": { "editor.tabSize": 2 }, diff --git a/README.md b/README.md index 5e0a4e1..85a869c 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ ## Clone nanapi ```sh -git clone https://git.japan7.bde.enseeiht.fr/Japan7/nanapi.git +git clone https://github.com/Japan7/nanapi.git ``` ## Setup EdgeDB