From a3d462bf510c1c33167b855361caea62b4399179 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mickae=CC=88l=20Menu?= Date: Fri, 24 Sep 2021 11:53:13 +0200 Subject: [PATCH 1/4] Add the bug report issue template --- .github/ISSUE_TEMPLATE/bug_report.md | 68 ++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 0000000000..9b461e4a09 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,68 @@ +--- +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 version: + +#### 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 + + From 733d4e256cf8ab4eabbc8c1e5c85183864e0347e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mickae=CC=88l=20Menu?= Date: Fri, 24 Sep 2021 11:54:10 +0200 Subject: [PATCH 2/4] Add GitHub workflows --- .github/workflows/lcp.yml | 20 +++++++++++++++ .github/workflows/navigator.yml | 44 +++++++++++++++++++++++++++++++++ .github/workflows/opds.yml | 20 +++++++++++++++ .github/workflows/shared.yml | 20 +++++++++++++++ .github/workflows/streamer.yml | 20 +++++++++++++++ 5 files changed, 124 insertions(+) create mode 100644 .github/workflows/lcp.yml create mode 100644 .github/workflows/navigator.yml create mode 100644 .github/workflows/opds.yml create mode 100644 .github/workflows/shared.yml create mode 100644 .github/workflows/streamer.yml diff --git a/.github/workflows/lcp.yml b/.github/workflows/lcp.yml new file mode 100644 index 0000000000..1b078fb5d5 --- /dev/null +++ b/.github/workflows/lcp.yml @@ -0,0 +1,20 @@ +name: LCP +on: [ push, pull_request ] + +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 :readium:lcp:build -x test + - name: 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..d07547b5c1 --- /dev/null +++ b/.github/workflows/navigator.yml @@ -0,0 +1,44 @@ +name: Navigator +on: [ push, pull_request ] + +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 :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 + - 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 readium/navigator/src/main/assets/readium/scripts + diff --git a/.github/workflows/opds.yml b/.github/workflows/opds.yml new file mode 100644 index 0000000000..0f65da2526 --- /dev/null +++ b/.github/workflows/opds.yml @@ -0,0 +1,20 @@ +name: OPDS +on: [ push, pull_request ] + +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 :readium:opds:build -x test + - name: Test + run: ./gradlew :readium:opds:test --continue diff --git a/.github/workflows/shared.yml b/.github/workflows/shared.yml new file mode 100644 index 0000000000..9f8a043934 --- /dev/null +++ b/.github/workflows/shared.yml @@ -0,0 +1,20 @@ +name: Shared +on: [ push, pull_request ] + +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 :readium:shared:build -x test + - name: Test + run: ./gradlew :readium:shared:test --continue diff --git a/.github/workflows/streamer.yml b/.github/workflows/streamer.yml new file mode 100644 index 0000000000..d3c037d032 --- /dev/null +++ b/.github/workflows/streamer.yml @@ -0,0 +1,20 @@ +name: Streamer +on: [ push, pull_request ] + +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 :readium:streamer:build -x test + - name: Test + run: ./gradlew :readium:streamer:test --continue From 2112c10e29605b7d8a47dfe61416ee00d40f4a86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mickae=CC=88l=20Menu?= Date: Fri, 24 Sep 2021 11:54:21 +0200 Subject: [PATCH 3/4] Remove all workflows and issue templates --- .../lcp/.github/ISSUE_TEMPLATE/bug_report.md | 76 ------------------- readium/lcp/.github/workflows/build.yml | 25 ------ .../.github/ISSUE_TEMPLATE/bug_report.md | 76 ------------------- readium/navigator/.github/workflows/build.yml | 25 ------ readium/navigator/.github/workflows/lint.yml | 28 ------- .../opds/.github/ISSUE_TEMPLATE/bug_report.md | 76 ------------------- readium/opds/.github/workflows/build.yml | 25 ------ .../.github/ISSUE_TEMPLATE/bug_report.md | 76 ------------------- readium/shared/.github/workflows/build.yml | 25 ------ .../.github/ISSUE_TEMPLATE/bug_report.md | 76 ------------------- readium/streamer/.github/workflows/build.yml | 25 ------ 11 files changed, 533 deletions(-) delete mode 100644 readium/lcp/.github/ISSUE_TEMPLATE/bug_report.md delete mode 100644 readium/lcp/.github/workflows/build.yml delete mode 100644 readium/navigator/.github/ISSUE_TEMPLATE/bug_report.md delete mode 100644 readium/navigator/.github/workflows/build.yml delete mode 100644 readium/navigator/.github/workflows/lint.yml delete mode 100644 readium/opds/.github/ISSUE_TEMPLATE/bug_report.md delete mode 100644 readium/opds/.github/workflows/build.yml delete mode 100644 readium/shared/.github/ISSUE_TEMPLATE/bug_report.md delete mode 100644 readium/shared/.github/workflows/build.yml delete mode 100644 readium/streamer/.github/ISSUE_TEMPLATE/bug_report.md delete mode 100644 readium/streamer/.github/workflows/build.yml diff --git a/readium/lcp/.github/ISSUE_TEMPLATE/bug_report.md b/readium/lcp/.github/ISSUE_TEMPLATE/bug_report.md deleted file mode 100644 index 36894ebd50..0000000000 --- a/readium/lcp/.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/lcp/.github/workflows/build.yml b/readium/lcp/.github/workflows/build.yml deleted file mode 100644 index fbf42cc092..0000000000 --- a/readium/lcp/.github/workflows/build.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: r2-lcp-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/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/build.yml b/readium/navigator/.github/workflows/build.yml deleted file mode 100644 index bf9c3f15c2..0000000000 --- a/readium/navigator/.github/workflows/build.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: Build - -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/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/opds/.github/workflows/build.yml b/readium/opds/.github/workflows/build.yml deleted file mode 100644 index 1971b7e988..0000000000 --- a/readium/opds/.github/workflows/build.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: r2-opds-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/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/shared/.github/workflows/build.yml b/readium/shared/.github/workflows/build.yml deleted file mode 100644 index fc8f5431c1..0000000000 --- a/readium/shared/.github/workflows/build.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: r2-shared-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 build -x test - - name: Test - run: ./gradlew test 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 From be891dc3c99166de802de8a7a559e571bee88c49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mickae=CC=88l=20Menu?= Date: Fri, 24 Sep 2021 12:01:38 +0200 Subject: [PATCH 4/4] Fix workflows --- .github/workflows/lcp.yml | 8 +++++++- .github/workflows/navigator.yml | 12 ++++++++++-- .github/workflows/opds.yml | 8 +++++++- .github/workflows/shared.yml | 8 +++++++- .github/workflows/streamer.yml | 8 +++++++- .github/workflows/test-app.yml | 24 ++++++++++++++++++++++++ test-app/.github/workflows/build.yml | 2 ++ 7 files changed, 64 insertions(+), 6 deletions(-) create mode 100644 .github/workflows/test-app.yml diff --git a/.github/workflows/lcp.yml b/.github/workflows/lcp.yml index 1b078fb5d5..ea417b8604 100644 --- a/.github/workflows/lcp.yml +++ b/.github/workflows/lcp.yml @@ -1,5 +1,9 @@ name: LCP -on: [ push, pull_request ] + +on: + push: + branches: [ main, develop ] + pull_request: jobs: build: @@ -9,6 +13,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 + with: + lfs: 'true' - name: Set up JDK 11 uses: actions/setup-java@v2 with: diff --git a/.github/workflows/navigator.yml b/.github/workflows/navigator.yml index d07547b5c1..b217d56694 100644 --- a/.github/workflows/navigator.yml +++ b/.github/workflows/navigator.yml @@ -1,5 +1,9 @@ name: Navigator -on: [ push, pull_request ] + +on: + push: + branches: [ main, develop ] + pull_request: jobs: build: @@ -9,6 +13,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 + with: + lfs: 'true' - name: Set up JDK 11 uses: actions/setup-java@v2 with: @@ -31,6 +37,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 + with: + lfs: 'true' - name: Install dependencies run: npm install --prefix "$scripts" - name: Lint JavaScript @@ -40,5 +48,5 @@ jobs: - name: Check if bundled scripts are up-to-date run: | make scripts - git diff --exit-code --name-only readium/navigator/src/main/assets/readium/scripts + git diff --exit-code --name-only src/main/assets/readium/scripts diff --git a/.github/workflows/opds.yml b/.github/workflows/opds.yml index 0f65da2526..b4cd85f0f0 100644 --- a/.github/workflows/opds.yml +++ b/.github/workflows/opds.yml @@ -1,5 +1,9 @@ name: OPDS -on: [ push, pull_request ] + +on: + push: + branches: [ main, develop ] + pull_request: jobs: build: @@ -9,6 +13,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 + with: + lfs: 'true' - name: Set up JDK 11 uses: actions/setup-java@v2 with: diff --git a/.github/workflows/shared.yml b/.github/workflows/shared.yml index 9f8a043934..5a72315886 100644 --- a/.github/workflows/shared.yml +++ b/.github/workflows/shared.yml @@ -1,5 +1,9 @@ name: Shared -on: [ push, pull_request ] + +on: + push: + branches: [ main, develop ] + pull_request: jobs: build: @@ -9,6 +13,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 + with: + lfs: 'true' - name: Set up JDK 11 uses: actions/setup-java@v2 with: diff --git a/.github/workflows/streamer.yml b/.github/workflows/streamer.yml index d3c037d032..9ada33caf4 100644 --- a/.github/workflows/streamer.yml +++ b/.github/workflows/streamer.yml @@ -1,5 +1,9 @@ name: Streamer -on: [ push, pull_request ] + +on: + push: + branches: [ main, develop ] + pull_request: jobs: build: @@ -9,6 +13,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 + with: + lfs: 'true' - name: Set up JDK 11 uses: actions/setup-java@v2 with: 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/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: