ci: Fixed pusblish script #4

Merged
edgardmessias merged 1 commit from fix-publish into main 2024-06-22 21:53:03 -05:00
2 changed files with 14 additions and 14 deletions

View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
set -e set -e
rsync -a --delete --exclude .git --exclude .gitignore ../master/repo/ . rsync -a --delete --exclude .git --exclude .gitignore ../main/repo/ .
git config --global user.email "aniyomi-bot@aniyomi.org" git config --global user.email "aniyomi-bot@aniyomi.org"
git config --global user.name "aniyomi-bot[bot]" git config --global user.name "aniyomi-bot[bot]"
git status git status

View file

@ -3,7 +3,7 @@ name: CI
on: on:
push: push:
branches: branches:
- master - main
paths: paths:
- '**' - '**'
- '!**.md' - '!**.md'
@ -28,7 +28,7 @@ jobs:
- name: Clone repo - name: Clone repo
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
with: with:
ref: master ref: main
token: ${{ secrets.ANIYOMIORG_BOT_PAT }} token: ${{ secrets.ANIYOMIORG_BOT_PAT }}
- name: Find lib changes - name: Find lib changes
@ -85,10 +85,10 @@ jobs:
strategy: strategy:
matrix: ${{ fromJSON(needs.prepare.outputs.individualMatrix) }} matrix: ${{ fromJSON(needs.prepare.outputs.individualMatrix) }}
steps: steps:
- name: Checkout master branch - name: Checkout main branch
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
with: with:
ref: master ref: main
- name: Set up JDK - name: Set up JDK
uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4 uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4
@ -113,7 +113,7 @@ jobs:
- name: Upload APKs (chunk ${{ matrix.chunk }}) - name: Upload APKs (chunk ${{ matrix.chunk }})
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4 uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4
if: "github.repository == 'aniyomiorg/aniyomi-extensions'" if: "github.repository == 'almightyhak/aniyomi-extensions'"
with: with:
name: "individual-apks-${{ matrix.chunk }}" name: "individual-apks-${{ matrix.chunk }}"
path: "**/*.apk" path: "**/*.apk"
@ -126,7 +126,7 @@ jobs:
name: Publish repo name: Publish repo
needs: needs:
- build_individual - build_individual
if: "github.repository == 'aniyomiorg/aniyomi-extensions'" if: "github.repository == 'almightyhak/aniyomi-extensions'"
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Download APK artifacts - name: Download APK artifacts
@ -140,15 +140,15 @@ jobs:
java-version: 17 java-version: 17
distribution: temurin distribution: temurin
- name: Checkout master branch - name: Checkout main branch
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
with: with:
ref: master ref: main
path: master path: main
- name: Create repo artifacts - name: Create repo artifacts
run: | run: |
cd master cd main
python ./.github/scripts/move-apks.py python ./.github/scripts/move-apks.py
INSPECTOR_LINK="$(curl -s "https://api.github.com/repos/aniyomiorg/aniyomi-extensions-inspector/releases/latest" | jq -r '.assets[0].browser_download_url')" INSPECTOR_LINK="$(curl -s "https://api.github.com/repos/aniyomiorg/aniyomi-extensions-inspector/releases/latest" | jq -r '.assets[0].browser_download_url')"
curl -L "$INSPECTOR_LINK" -o ./Inspector.jar curl -L "$INSPECTOR_LINK" -o ./Inspector.jar
@ -158,9 +158,9 @@ jobs:
- name: Checkout repo branch - name: Checkout repo branch
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
with: with:
repository: aniyomiorg/aniyomi-extensions repository: almightyhak/aniyomi-anime-repo
token: ${{ secrets.ANIYOMIORG_BOT_PAT }} token: ${{ secrets.ANIYOMIORG_BOT_PAT }}
ref: repo ref: main
path: repo path: repo
- name: Import GPG key - name: Import GPG key
@ -175,4 +175,4 @@ jobs:
- name: Deploy repo - name: Deploy repo
run: | run: |
cd repo cd repo
../master/.github/scripts/commit-repo.sh ../main/.github/scripts/commit-repo.sh