diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml index 9a8b51c2a6..d9b3d0d95d 100644 --- a/.github/workflows/develop.yml +++ b/.github/workflows/develop.yml @@ -3,7 +3,6 @@ name: darts develop workflow on: push: branches-ignore: - - master - develop jobs: @@ -71,4 +70,3 @@ jobs: - name: "6. Build docs" run: | ./gradlew buildDocs - diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 5d55a82693..46d96feb28 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -10,10 +10,9 @@ on: jobs: tests: - runs-on: ${{ matrix.os }} + runs-on: macos-latest strategy: matrix: - os: [macos-latest, ubuntu-latest] python-version: [3.6, 3.7, 3.8] steps: @@ -59,36 +58,3 @@ jobs: - name: "3. Run examples ${{matrix.example-name}}" run: | ./gradlew checkExample -PexampleName=${{matrix.example-name}} - - docs: - runs-on: ubuntu-latest - - steps: - - name: "1. Clone repository" - uses: actions/checkout@v2 - - - name: "2. Set up Python 3.6" - uses: actions/setup-python@v1 - with: - python-version: 3.6 - - - name: "3. Install pandoc" - run: | - sudo apt-get install -y pandoc - - - name: "4. Setup pip" - run: | - ./gradlew setupPip - - - name: "5. Attach cache for pip" - uses: actions/cache@v1 - id: cache - with: - path: ~/.cache/pip - key: release-${{ runner.os }}-pip-${{ hashFiles('requirements/main.txt', 'requirements/release.txt') }} - restore-keys: | - release-${{ runner.os }}-pip- - - - name: "6. Build docs" - run: | - ./gradlew buildDocs