diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 535bedaa4d..1639c11cd9 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -9,44 +9,50 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.3.1 + - uses: actions/checkout@v2.3.2 - name: Make gradlew executable run: chmod +x ./gradlew - name: Set up JDK 11 - uses: actions/setup-java@v1.3.0 + uses: actions/setup-java@v1.4.2 with: java-version: 11 - name: Update Gradle Wrapper run: ./gradlew wrapper --gradle-version $(curl -s https://api.github.com/repos/gradle/gradle/releases/latest | grep -Po '"name":.*?[^\\]",' | sed -r 's/[\"name:, ]+//g') --distribution-type all --console=plain - name: Create Gradle wrapper update Pull Request - uses: Owain94/create-pull-request@master - env: - GITHUB_TOKEN: ${{ secrets.OpenOSRS }} - PULL_REQUEST_BRANCH: GRADLE-WRAPPER-UPDATE - PULL_REQUEST_TITLE: 'project: Update gradle wrapper' - PULL_REQUEST_BODY: This is an auto-generated PR with an updated gradle version - COMMIT_MESSAGE: 'project: Update gradle wrapper' - PULL_REQUEST_LABELS: automated-pull-request, gradle + uses: peter-evans/create-pull-request@v3 + with: + token: ${{ secrets.OpenOSRS }} + author: OpenOSRS + committer: OpenOSRS + branch: GRADLE-WRAPPER-UPDATE + commit-message: 'gradle: Update gradle wrapper' + title: 'gradle: Update gradle wrapper' + body: This is an auto-generated PR with an updated gradle version + labels: automated-pull-request, gradle + signoff: false update-dependencies: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.3.1 + - uses: actions/checkout@v2.3.2 - name: Make gradlew executable run: chmod +x ./gradlew - name: Set up JDK 11 - uses: actions/setup-java@v1.3.0 + uses: actions/setup-java@v1.4.2 with: java-version: 11 - name: Update Gradle Dependencies run: ./gradlew useLatestVersions --console=plain - name: Create Gradle dependencies update Pull Request - uses: Owain94/create-pull-request@master - env: - GITHUB_TOKEN: ${{ secrets.Owain }} - PULL_REQUEST_BRANCH: GRADLE-DEPS-UPDATE - PULL_REQUEST_TITLE: 'project: Update gradle dependencies' - PULL_REQUEST_BODY: This is an auto-generated PR with updated gradle dependencies - COMMIT_MESSAGE: 'project: Update gradle dependencies' - PULL_REQUEST_LABELS: automated-pull-request, gradle + uses: peter-evans/create-pull-request@v3 + with: + token: ${{ secrets.OpenOSRS }} + author: OpenOSRS + committer: OpenOSRS + branch: GRADLE-DEPS-UPDATE + commit-message: 'gradle: Update gradle dependencies' + title: 'gradle: Update gradle dependencies' + body: This is an auto-generated PR with an updated gradle dependencies + labels: automated-pull-request, gradle + signoff: false diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index fe27886abb..b75d5c2597 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -12,7 +12,7 @@ jobs: steps: - name: automerge - if: github.event_name == 'pull_request' && github.actor == 'OpenOSRS' + if: github.event_name == 'pull_request' && github.actor == 'Owain94' uses: pascalgn/automerge-action@master env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -31,7 +31,7 @@ jobs: id: extract_branch - name: Delete PR head branch - if: github.event_name == 'pull_request' && github.actor == 'OpenOSRS' + if: github.event_name == 'pull_request' && github.actor == 'Owain94' uses: dawidd6/action-delete-branch@master with: github_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 0fd83e3e1c..4ef1ba40dc 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -20,7 +20,7 @@ jobs: name: Validate gradle wrapper runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.3.1 + - uses: actions/checkout@v2.3.2 - uses: gradle/wrapper-validation-action@v1.0.3 build: @@ -29,8 +29,8 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.3.1 - - uses: actions/cache@v2.0.0 + - uses: actions/checkout@v2.3.2 + - uses: actions/cache@v2.1.1 with: path: ~/.gradle/caches key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }} @@ -39,7 +39,7 @@ jobs: - name: Make gradlew executable run: chmod +x ./gradlew - name: Set up JDK 11 - uses: actions/setup-java@v1.3.0 + uses: actions/setup-java@v1.4.2 with: java-version: 11 - name: Assembling @@ -53,8 +53,8 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.3.1 - - uses: actions/cache@v2.0.0 + - uses: actions/checkout@v2.3.2 + - uses: actions/cache@v2.1.1 with: path: ~/.gradle/caches key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }} @@ -63,7 +63,7 @@ jobs: - name: Make gradlew executable run: chmod +x ./gradlew - name: Set up JDK 11 - uses: actions/setup-java@v1.3.0 + uses: actions/setup-java@v1.4.2 with: java-version: 11 - name: Assembling @@ -77,8 +77,8 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.3.1 - - uses: actions/cache@v2.0.0 + - uses: actions/checkout@v2.3.2 + - uses: actions/cache@v2.1.1 with: path: ~/.gradle/caches key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }} @@ -87,7 +87,7 @@ jobs: - name: Make gradlew executable run: chmod +x ./gradlew - name: Set up JDK 11 - uses: actions/setup-java@v1.3.0 + uses: actions/setup-java@v1.4.2 with: java-version: 11 - name: Assembling @@ -101,8 +101,8 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.3.1 - - uses: actions/cache@v2.0.0 + - uses: actions/checkout@v2.3.2 + - uses: actions/cache@v2.1.1 with: path: ~/.gradle/caches key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }} @@ -111,7 +111,7 @@ jobs: - name: Make gradlew executable run: chmod +x ./gradlew - name: Set up JDK 11 - uses: actions/setup-java@v1.3.0 + uses: actions/setup-java@v1.4.2 with: java-version: 11 - name: Assembling diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 38ddf8b406..bc8638f131 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -11,8 +11,8 @@ jobs: name: Build steps: - - uses: actions/checkout@v2.3.1 - - uses: actions/cache@v2.0.0 + - uses: actions/checkout@v2.3.2 + - uses: actions/cache@v2.1.1 with: path: ~/.gradle/caches key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }} @@ -21,7 +21,7 @@ jobs: - name: Make gradlew executable run: chmod +x ./gradlew - name: Set up JDK 11 - uses: actions/setup-java@v1.3.0 + uses: actions/setup-java@v1.4.2 with: java-version: 11 - name: Assembling @@ -34,8 +34,8 @@ jobs: name: Test steps: - - uses: actions/checkout@v2.3.1 - - uses: actions/cache@v2.0.0 + - uses: actions/checkout@v2.3.2 + - uses: actions/cache@v2.1.1 with: path: ~/.gradle/caches key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }} @@ -44,7 +44,7 @@ jobs: - name: Make gradlew executable run: chmod +x ./gradlew - name: Set up JDK 11 - uses: actions/setup-java@v1.3.0 + uses: actions/setup-java@v1.4.2 with: java-version: 11 - name: Assembling @@ -57,8 +57,8 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.3.1 - - uses: actions/cache@v2.0.0 + - uses: actions/checkout@v2.3.2 + - uses: actions/cache@v2.1.1 with: path: ~/.gradle/caches key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }} @@ -67,7 +67,7 @@ jobs: - name: Make gradlew executable run: chmod +x ./gradlew - name: Set up JDK 11 - uses: actions/setup-java@v1.3.0 + uses: actions/setup-java@v1.4.2 with: java-version: 11 - name: Assembling @@ -80,8 +80,8 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.3.1 - - uses: actions/cache@v2.0.0 + - uses: actions/checkout@v2.3.2 + - uses: actions/cache@v2.1.1 with: path: ~/.gradle/caches key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }} @@ -90,7 +90,7 @@ jobs: - name: Make gradlew executable run: chmod +x ./gradlew - name: Set up JDK 11 - uses: actions/setup-java@v1.3.0 + uses: actions/setup-java@v1.4.2 with: java-version: 11 - name: Assembling diff --git a/.github/workflows/scraper.yml b/.github/workflows/scraper.yml index bab28f3a54..bd49ad64e1 100644 --- a/.github/workflows/scraper.yml +++ b/.github/workflows/scraper.yml @@ -9,17 +9,13 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.3.1 - with: - repository: open-osrs/runelite - ref: master - - - uses: actions/checkout@v2.3.1 + - uses: actions/checkout@v2.3.2 with: repository: open-osrs/cache-client ref: master + path: cache-client - - uses: actions/cache@v2.0.0 + - uses: actions/cache@v2.1.1 with: path: ~/.gradle/caches key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }} @@ -27,48 +23,58 @@ jobs: ${{ runner.os }}-gradle- - name: Set up JDK 11 - uses: actions/setup-java@v1.3.0 + uses: actions/setup-java@v1.4.2 with: java-version: 11 - name: Make gradlew executable run: chmod +x ./gradlew - working-directory: /home/runner/work/runelite/runelite - - - name: Make gradlew executable - run: chmod +x ./gradlew - working-directory: /home/runner/work/runelite/cache-client + working-directory: cache-client - name: Assembling cache client run: ./gradlew assemble --console=plain - working-directory: /home/runner/work/runelite/cache-client - - - name: Assembling scraper - run: ./gradlew :wiki-scraper:assemble --console=plain - working-directory: /home/runner/work/runelite/runelite - - - name: Building cache client - run: ./gradlew build --console=plain - working-directory: /home/runner/work/runelite/cache-client - - - name: Building scraper - run: ./gradlew :wiki-scraper:build --console=plain - working-directory: /home/runner/work/runelite/runelite + working-directory: cache-client - name: Downloading jagex cache run: ./gradlew download --console=plain - working-directory: /home/runner/work/runelite/cache-client + working-directory: cache-client + + - uses: actions/checkout@v2.3.2 + with: + repository: open-osrs/runelite + ref: master + path: OpenOSRS + + - name: Make gradlew executable + run: chmod +x ./gradlew + working-directory: OpenOSRS + + - name: Assembling scraper + run: ./gradlew :wiki-scraper:assemble --console=plain + working-directory: OpenOSRS + + - name: Building cache client + run: ./gradlew build --console=plain + working-directory: cache-client + + - name: Building scraper + run: ./gradlew :wiki-scraper:build --console=plain + working-directory: OpenOSRS - name: Scraping NPC stats run: ./gradlew :wiki-scraper:npcStatsScrape --console=plain - working-directory: /home/runner/work/runelite/runelite + working-directory: OpenOSRS - name: Create NPC stats Pull Request - uses: Owain94/create-pull-request@master - env: - GITHUB_TOKEN: ${{ secrets.OpenOSRS }} - PULL_REQUEST_BRANCH: NPC-UPDATE - PULL_REQUEST_TITLE: 'Client: Update NPC stats' - PULL_REQUEST_BODY: This is an auto-generated PR with changes from the OSRS wiki - COMMIT_MESSAGE: 'Client: Update NPC stats' - PULL_REQUEST_LABELS: automated-pull-request, NPC stats + uses: peter-evans/create-pull-request@v3 + with: + token: ${{ secrets.OpenOSRS }} + path: /home/runner/work/runelite/runelite/OpenOSRS + author: OpenOSRS + committer: OpenOSRS + branch: NPC-UPDATE + commit-message: 'client: Update NPC stats' + title: 'client: Update NPC stats' + body: This is an auto-generated PR with changes from the OSRS wiki + labels: automated-pull-request, NPC stats + signoff: false diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index a2bae411b8..d6f4d1bc5f 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/stale@v3.0.7 + - uses: actions/stale@v3.0.10 with: repo-token: ${{ secrets.GITHUB_TOKEN }} stale-issue-message: 'Stale issue message'