diff --git a/readium/lcp/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md similarity index 87% rename from readium/lcp/.github/ISSUE_TEMPLATE/bug_report.md rename to .github/ISSUE_TEMPLATE/bug_report.md index 36894ebd50..9b461e4a09 100644 --- a/readium/lcp/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -30,7 +30,7 @@ If you can, drag and drop screenshots or a screencast to show the problem, they -#### Readium versions - - - -* `r2-shared-kotlin`: -* `r2-streamer-kotlin`: -* `r2-navigator-kotlin`: -* `r2-opds-kotlin`: -* `r2-lcp-kotlin`: +* Readium version: #### Development environment diff --git a/readium/shared/.github/workflows/build.yml b/.github/workflows/lcp.yml similarity index 64% rename from readium/shared/.github/workflows/build.yml rename to .github/workflows/lcp.yml index fc8f5431c1..ea417b8604 100644 --- a/readium/shared/.github/workflows/build.yml +++ b/.github/workflows/lcp.yml @@ -1,10 +1,9 @@ -name: r2-shared-kotlin +name: LCP on: push: - branches: [ develop ] + branches: [ main, develop ] pull_request: - branches: [ develop ] jobs: build: @@ -14,12 +13,14 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 + with: + lfs: 'true' - name: Set up JDK 11 uses: actions/setup-java@v2 with: java-version: '11' distribution: 'adopt' - name: Build - run: ./gradlew build -x test + run: ./gradlew clean :readium:lcp:build -x test - name: Test - run: ./gradlew test + run: ./gradlew :readium:lcp:test --continue diff --git a/.github/workflows/navigator.yml b/.github/workflows/navigator.yml new file mode 100644 index 0000000000..b217d56694 --- /dev/null +++ b/.github/workflows/navigator.yml @@ -0,0 +1,52 @@ +name: Navigator + +on: + push: + branches: [ main, develop ] + pull_request: + +jobs: + build: + name: Build and test + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v2 + with: + lfs: 'true' + - name: Set up JDK 11 + uses: actions/setup-java@v2 + with: + java-version: '11' + distribution: 'adopt' + - name: Build + run: ./gradlew clean :readium:navigator:build -x test + - name: Test + run: ./gradlew :readium:navigator:test --continue + + lint: + name: Lint + runs-on: macos-latest + defaults: + run: + working-directory: readium/navigator + env: + scripts: ${{ 'src/main/assets/_scripts' }} + + steps: + - name: Checkout + uses: actions/checkout@v2 + with: + lfs: 'true' + - name: Install dependencies + run: npm install --prefix "$scripts" + - name: Lint JavaScript + run: yarn --cwd "$scripts" run lint + - name: Check JavaScript formatting + run: yarn --cwd "$scripts" run checkformat + - name: Check if bundled scripts are up-to-date + run: | + make scripts + git diff --exit-code --name-only src/main/assets/readium/scripts + diff --git a/readium/lcp/.github/workflows/build.yml b/.github/workflows/opds.yml similarity index 64% rename from readium/lcp/.github/workflows/build.yml rename to .github/workflows/opds.yml index fbf42cc092..b4cd85f0f0 100644 --- a/readium/lcp/.github/workflows/build.yml +++ b/.github/workflows/opds.yml @@ -1,10 +1,9 @@ -name: r2-lcp-kotlin +name: OPDS on: push: - branches: [ develop ] + branches: [ main, develop ] pull_request: - branches: [ develop ] jobs: build: @@ -14,12 +13,14 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 + with: + lfs: 'true' - name: Set up JDK 11 uses: actions/setup-java@v2 with: java-version: '11' distribution: 'adopt' - name: Build - run: ./gradlew clean build -x test + run: ./gradlew clean :readium:opds:build -x test - name: Test - run: ./gradlew test --continue + run: ./gradlew :readium:opds:test --continue diff --git a/readium/opds/.github/workflows/build.yml b/.github/workflows/shared.yml similarity index 63% rename from readium/opds/.github/workflows/build.yml rename to .github/workflows/shared.yml index 1971b7e988..5a72315886 100644 --- a/readium/opds/.github/workflows/build.yml +++ b/.github/workflows/shared.yml @@ -1,10 +1,9 @@ -name: r2-opds-kotlin +name: Shared on: push: - branches: [ develop ] + branches: [ main, develop ] pull_request: - branches: [ develop ] jobs: build: @@ -14,12 +13,14 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 + with: + lfs: 'true' - name: Set up JDK 11 uses: actions/setup-java@v2 with: java-version: '11' distribution: 'adopt' - name: Build - run: ./gradlew clean build -x test + run: ./gradlew clean :readium:shared:build -x test - name: Test - run: ./gradlew test --continue + run: ./gradlew :readium:shared:test --continue diff --git a/readium/navigator/.github/workflows/build.yml b/.github/workflows/streamer.yml similarity index 63% rename from readium/navigator/.github/workflows/build.yml rename to .github/workflows/streamer.yml index bf9c3f15c2..9ada33caf4 100644 --- a/readium/navigator/.github/workflows/build.yml +++ b/.github/workflows/streamer.yml @@ -1,10 +1,9 @@ -name: Build +name: Streamer on: push: - branches: [ develop ] + branches: [ main, develop ] pull_request: - branches: [ develop ] jobs: build: @@ -14,12 +13,14 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 + with: + lfs: 'true' - name: Set up JDK 11 uses: actions/setup-java@v2 with: java-version: '11' distribution: 'adopt' - name: Build - run: ./gradlew clean build -x test + run: ./gradlew clean :readium:streamer:build -x test - name: Test - run: ./gradlew test --continue + run: ./gradlew :readium:streamer:test --continue diff --git a/.github/workflows/test-app.yml b/.github/workflows/test-app.yml new file mode 100644 index 0000000000..388850d9fb --- /dev/null +++ b/.github/workflows/test-app.yml @@ -0,0 +1,24 @@ +name: Test App + +on: + push: + branches: [ main, develop ] + pull_request: + +jobs: + build: + name: Build + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v2 + with: + lfs: 'true' + - name: Set up JDK 11 + uses: actions/setup-java@v2 + with: + java-version: '11' + distribution: 'adopt' + - name: Build + run: ./gradlew clean :test-app:build diff --git a/readium/navigator/.github/ISSUE_TEMPLATE/bug_report.md b/readium/navigator/.github/ISSUE_TEMPLATE/bug_report.md deleted file mode 100644 index 36894ebd50..0000000000 --- a/readium/navigator/.github/ISSUE_TEMPLATE/bug_report.md +++ /dev/null @@ -1,76 +0,0 @@ ---- -name: Bug report -about: Create a report to help us improve -title: '' -labels: '' -assignees: '' - ---- - -## Bug Report - - - -### What happened? - - - -### Expected behavior - - - -### How to reproduce? - - - -### Environment - - - -#### Readium versions - - - -* `r2-shared-kotlin`: -* `r2-streamer-kotlin`: -* `r2-navigator-kotlin`: -* `r2-opds-kotlin`: -* `r2-lcp-kotlin`: - -#### Development environment - -* OS: -* IDE: - -#### Testing device - -* Android version: -* Model: -* Is it an emulator? Yes or No - -### Additional context - -* Are you willing to fix the problem and contribute a pull request? Yes or No - - diff --git a/readium/navigator/.github/workflows/lint.yml b/readium/navigator/.github/workflows/lint.yml deleted file mode 100644 index 251dce18a5..0000000000 --- a/readium/navigator/.github/workflows/lint.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: Lint - -on: - push: - branches: [ develop ] - pull_request: - branches: [ develop ] - -jobs: - lint: - name: Lint - runs-on: macos-latest - env: - scripts: ${{ 'r2-navigator/src/main/assets/_scripts' }} - - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Install dependencies - run: npm install --prefix "$scripts" - - name: Lint JavaScript - run: yarn --cwd "$scripts" run lint - - name: Check JavaScript formatting - run: yarn --cwd "$scripts" run checkformat - - name: Check if bundled scripts are up-to-date - run: | - make scripts - git diff --exit-code --name-only r2-navigator/src/main/assets/readium/scripts diff --git a/readium/opds/.github/ISSUE_TEMPLATE/bug_report.md b/readium/opds/.github/ISSUE_TEMPLATE/bug_report.md deleted file mode 100644 index 36894ebd50..0000000000 --- a/readium/opds/.github/ISSUE_TEMPLATE/bug_report.md +++ /dev/null @@ -1,76 +0,0 @@ ---- -name: Bug report -about: Create a report to help us improve -title: '' -labels: '' -assignees: '' - ---- - -## Bug Report - - - -### What happened? - - - -### Expected behavior - - - -### How to reproduce? - - - -### Environment - - - -#### Readium versions - - - -* `r2-shared-kotlin`: -* `r2-streamer-kotlin`: -* `r2-navigator-kotlin`: -* `r2-opds-kotlin`: -* `r2-lcp-kotlin`: - -#### Development environment - -* OS: -* IDE: - -#### Testing device - -* Android version: -* Model: -* Is it an emulator? Yes or No - -### Additional context - -* Are you willing to fix the problem and contribute a pull request? Yes or No - - diff --git a/readium/shared/.github/ISSUE_TEMPLATE/bug_report.md b/readium/shared/.github/ISSUE_TEMPLATE/bug_report.md deleted file mode 100644 index 36894ebd50..0000000000 --- a/readium/shared/.github/ISSUE_TEMPLATE/bug_report.md +++ /dev/null @@ -1,76 +0,0 @@ ---- -name: Bug report -about: Create a report to help us improve -title: '' -labels: '' -assignees: '' - ---- - -## Bug Report - - - -### What happened? - - - -### Expected behavior - - - -### How to reproduce? - - - -### Environment - - - -#### Readium versions - - - -* `r2-shared-kotlin`: -* `r2-streamer-kotlin`: -* `r2-navigator-kotlin`: -* `r2-opds-kotlin`: -* `r2-lcp-kotlin`: - -#### Development environment - -* OS: -* IDE: - -#### Testing device - -* Android version: -* Model: -* Is it an emulator? Yes or No - -### Additional context - -* Are you willing to fix the problem and contribute a pull request? Yes or No - - diff --git a/readium/streamer/.github/ISSUE_TEMPLATE/bug_report.md b/readium/streamer/.github/ISSUE_TEMPLATE/bug_report.md deleted file mode 100644 index 36894ebd50..0000000000 --- a/readium/streamer/.github/ISSUE_TEMPLATE/bug_report.md +++ /dev/null @@ -1,76 +0,0 @@ ---- -name: Bug report -about: Create a report to help us improve -title: '' -labels: '' -assignees: '' - ---- - -## Bug Report - - - -### What happened? - - - -### Expected behavior - - - -### How to reproduce? - - - -### Environment - - - -#### Readium versions - - - -* `r2-shared-kotlin`: -* `r2-streamer-kotlin`: -* `r2-navigator-kotlin`: -* `r2-opds-kotlin`: -* `r2-lcp-kotlin`: - -#### Development environment - -* OS: -* IDE: - -#### Testing device - -* Android version: -* Model: -* Is it an emulator? Yes or No - -### Additional context - -* Are you willing to fix the problem and contribute a pull request? Yes or No - - diff --git a/readium/streamer/.github/workflows/build.yml b/readium/streamer/.github/workflows/build.yml deleted file mode 100644 index ef2361cc70..0000000000 --- a/readium/streamer/.github/workflows/build.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: r2-streamer-kotlin - -on: - push: - branches: [ develop ] - pull_request: - branches: [ develop ] - -jobs: - build: - name: Build and test - runs-on: ubuntu-latest - - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Set up JDK 11 - uses: actions/setup-java@v2 - with: - java-version: '11' - distribution: 'adopt' - - name: Build - run: ./gradlew clean build -x test - - name: Test - run: ./gradlew test --continue diff --git a/test-app/.github/workflows/build.yml b/test-app/.github/workflows/build.yml index 8f38dcdc2d..bf2104fc49 100644 --- a/test-app/.github/workflows/build.yml +++ b/test-app/.github/workflows/build.yml @@ -14,6 +14,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 + with: + lfs: 'true' - name: Set up JDK 11 uses: actions/setup-java@v2 with: