Skip to content

Commit

Permalink
Merge pull request #758 from modos189/fix/build
Browse files Browse the repository at this point in the history
Fix IITC Mobile build and update github actions
  • Loading branch information
modos189 authored Sep 6, 2024
2 parents e6fb8a4 + c213c60 commit 05e58d0
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 20 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17'
cache: 'gradle'

- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: '3.9'

Expand Down Expand Up @@ -88,9 +88,10 @@ jobs:
echo $( ls ./artifact/build/ | grep '.zip' ) > ./artifact/.metadata/zip_filename
echo $(date -u +'%Y-%m-%d_%H-%M' -d"$(stat -c %y ./artifact/build/total-conversion-build.user.js)") > ./artifact/.metadata/buildstamp
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
with:
name: build
include-hidden-files: true
path: |
./artifact/.metadata/
./artifact/build/
9 changes: 5 additions & 4 deletions .github/workflows/build_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17'
cache: 'gradle'

- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: '3.9'

Expand All @@ -46,9 +46,10 @@ jobs:
echo $( ls ./build/build/ | grep '.zip' ) > ./build/.metadata/zip_filename
echo $(date -u +'%Y-%m-%d_%H-%M' -d"$(stat -c %y ./build/build/total-conversion-build.user.js)") > ./build/.metadata/buildstamp
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
with:
name: build
include-hidden-files: true
path: |
./build/.metadata/
./build/build/
6 changes: 3 additions & 3 deletions .github/workflows/jsdoc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Build
uses: andstor/jsdoc-action@v1
uses: zhennann/jsdoc-action@v1
with:
output_dir: ./out
config_file: jsdoc-conf.json
Expand All @@ -25,7 +25,7 @@ jobs:

- name: Deploy
if: github.event_name != 'pull_request'
uses: peaceiris/actions-gh-pages@v3
uses: peaceiris/actions-gh-pages@v4
with:
deploy_key: ${{ secrets.ACTIONS_DEPLOY_KEY }}
publish_dir: ./out
2 changes: 1 addition & 1 deletion .github/workflows/merge_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
env:
WEBSITE_REPO: ${{ secrets.WEBSITE_REPO }}
if: ${{ env.WEBSITE_REPO != '' }}
uses: peter-evans/repository-dispatch@v2
uses: peter-evans/repository-dispatch@v3
with:
token: ${{ secrets.API_TOKEN_GITHUB }}
repository: ${{ env.WEBSITE_REPO }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reviewdog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
pull-requests: write

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- uses: reviewdog/action-eslint@v1
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/send_build_to_website.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
if: ${{ github.event.workflow_run.conclusion == 'success' }}
steps:
- name: 'Download artifact'
uses: actions/github-script@v6
uses: actions/github-script@v7
env:
WEBSITE_REPO: ${{ secrets.WEBSITE_REPO }}
if: ${{ env.WEBSITE_REPO != '' }}
Expand Down Expand Up @@ -79,7 +79,7 @@ jobs:
env:
WEBSITE_REPO: ${{ secrets.WEBSITE_REPO }}
if: ${{ env.WEBSITE_REPO != '' }}
uses: peter-evans/repository-dispatch@v2
uses: peter-evans/repository-dispatch@v3
with:
token: ${{ secrets.API_TOKEN_GITHUB }}
repository: ${{ env.WEBSITE_REPO }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ jobs:
name: 'Node.js v18'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: '18'
- name: 'Cache node_modules'
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.npm
key: ${{ runner.os }}-node-18-${{ hashFiles('**/package.json') }}
Expand Down
2 changes: 1 addition & 1 deletion mobile/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ dependencies {
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'com.squareup.okhttp3:okhttp:3.12.1'
implementation 'com.github.AppIntro:AppIntro:6.3.1'
implementation 'com.akexorcist:localization:1.2.5'
implementation 'com.akexorcist:localization:1.2.11'
implementation 'org.apache.commons:commons-text:1.8'
implementation 'androidx.recyclerview:recyclerview:1.1.0'
implementation 'com.melnykov:floatingactionbutton:1.3.0'
Expand Down
2 changes: 1 addition & 1 deletion mobile/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ buildscript {
allprojects {
repositories {
google()
jcenter()
mavenCentral()
maven { url 'https://jitpack.io' }
}
}
Expand Down

0 comments on commit 05e58d0

Please sign in to comment.