Skip to content

Commit

Permalink
[MOD] gha workflows by using gha repo [skip ci]
Browse files Browse the repository at this point in the history
Signed-off-by: anuttinck <[email protected]>
  • Loading branch information
alexnuttinck committed Sep 26, 2024
1 parent 58b5205 commit 28e6985
Show file tree
Hide file tree
Showing 8 changed files with 61 additions and 260 deletions.
36 changes: 0 additions & 36 deletions .github/workflows/branch-coverage-gha.yml

This file was deleted.

39 changes: 20 additions & 19 deletions .github/workflows/branch-coverage.yml
Original file line number Diff line number Diff line change
@@ -1,36 +1,37 @@
# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions

name: Branch Coverage

on:
push:
workflow_dispatch:

jobs:
coverage:
runs-on: ubuntu-latest
runs-on: gha-runners-delib-py3
strategy:
fail-fast: false
matrix:
python-version: ["3.12"]
plone-version: ["6.0"]
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Cache eggs
uses: actions/cache@v2
- name: Run check
uses: IMIO/gha/plone-package-test-notify@v3
env:
cache-name: cache-eggs
with:
path: ./buildout-cache/eggs
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ matrix.python-version }} }}
restore-keys: ${{ runner.os }}-build-${{ env.cache-name }}-${{ matrix.python-version }}
- name: Buildout action
uses: IMIO/plonemeeting.portal.core/actions/buildout/@master
with:
py-version: ${{ matrix.python-version }}
plone-version: ${{ matrix.plone-version }}
- name: Coverage action
uses: IMIO/plonemeeting.portal.core/actions/coverage/@master
with:
PYTHON_VERSION: ${{ matrix.python-version }}
CACHE_KEY: ${{ runner.os }}-build-${{ env.cache-name }}-${{ matrix.python-version }}
TEST_COMMAND: coverage run bin/test
REQUIREMENTS_FILE: 'requirements-tests.txt'
MATTERMOST_WEBHOOK_URL: ${{ secrets.DELIB_MATTERMOST_WEBHOOK_URL }}
BUILDOUT_CONFIG_FILE: 'test-${{ matrix.plone-version }}.cfg'
- name: Report
run: |
coverage report
coverage xml
shell: bash
- name: Publish to Coveralls
run: |
coveralls --service=github
shell: bash
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
64 changes: 0 additions & 64 deletions .github/workflows/pull_request-gha.yml

This file was deleted.

74 changes: 32 additions & 42 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions

name: Pull Request

on:
pull_request:
workflow_dispatch:

jobs:
test:
runs-on: ubuntu-latest
runs-on: gha-runners-delib-py3
continue-on-error: ${{ matrix.experimental }}
strategy:
fail-fast: false
Expand All @@ -17,55 +15,47 @@ jobs:
plone-version: ["6.0"]
experimental: [false]
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Cache eggs
uses: actions/cache@v2
env:
cache-name: cache-eggs
with:
path: ./buildout-cache/eggs
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ matrix.python-version }}-${{ matrix.plone-version }}-${{ hashFiles('setup.*') }}
restore-keys: ${{ runner.os }}-build-${{ env.cache-name }}-${{ matrix.python-version }}-${{ matrix.plone-version }}
- name: Buildout action
uses: IMIO/plonemeeting.portal.core/actions/buildout/@master
with:
py-version: ${{ matrix.python-version }}
plone-version: ${{ matrix.plone-version }}
# - name: code analysis
# run: |
# pre-commit run --all-files
- name: Test
run: |
bin/test
- name: Run tests
uses: IMIO/gha/plone-package-test-notify@v3
env:
cache-name: cache-eggs
with:
PYTHON_VERSION: ${{ matrix.python-version }}
CACHE_KEY: ${{ runner.os }}-build-${{ env.cache-name }}-${{ matrix.python-version }}
TEST_COMMAND: bin/test
REQUIREMENTS_FILE: 'requirements-tests.txt'
MATTERMOST_WEBHOOK_URL: ${{ secrets.DELIB_MATTERMOST_WEBHOOK_URL }}
BUILDOUT_CONFIG_FILE: 'test-${{ matrix.plone-version }}.cfg'
coverage:
runs-on: ubuntu-latest
runs-on: gha-runners-delib-py3
strategy:
fail-fast: false
matrix:
python-version: ["3.12"]
plone-version: ["6.0"]
experimental: [false]
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Cache eggs
uses: actions/cache@v2
- name: Run coverage
uses: IMIO/gha/plone-package-test-notify@main
env:
cache-name: cache-eggs
with:
path: ./buildout-cache/eggs
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ matrix.python-version }} }}
restore-keys: ${{ runner.os }}-build-${{ env.cache-name }}-${{ matrix.python-version }}
- name: Buildout action
uses: IMIO/plonemeeting.portal.core/actions/buildout/@master
with:
py-version: ${{ matrix.python-version }}
plone-version: ${{ matrix.plone-version }}
- name: Coverage action
uses: IMIO/plonemeeting.portal.core/actions/coverage/@master
with:
PYTHON_VERSION: ${{ matrix.python-version }}
CACHE_KEY: ${{ runner.os }}-build-${{ env.cache-name }}-${{ matrix.python-version }}
TEST_COMMAND: coverage run bin/test
REQUIREMENTS_FILE: 'requirements-tests.txt'
MATTERMOST_WEBHOOK_URL: ${{ secrets.DELIB_MATTERMOST_WEBHOOK_URL }}
BUILDOUT_CONFIG_FILE: 'test-${{ matrix.plone-version }}.cfg'
- name: Report
run: |
coverage report
coverage xml
shell: bash
- name: Publish to Coveralls
run: |
coveralls --service=github
shell: bash
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Cobertura
uses: 5monkeys/cobertura-action@v9
Expand Down
27 changes: 0 additions & 27 deletions .github/workflows/tests-gha.yml

This file was deleted.

31 changes: 9 additions & 22 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions

name: Test package

on:
Expand All @@ -9,7 +6,7 @@ on:

jobs:
test:
runs-on: ubuntu-latest
runs-on: gha-runners-delib-py3
continue-on-error: ${{ matrix.experimental }}
strategy:
fail-fast: false
Expand All @@ -18,24 +15,14 @@ jobs:
plone-version: ["6.0"]
experimental: [false]
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Cache eggs
uses: actions/cache@v2
- name: Run tests
uses: IMIO/gha/plone-package-test-notify@v3
env:
cache-name: cache-eggs
with:
path: ./buildout-cache/eggs
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ matrix.python-version }}-${{ matrix.plone-version }} }}
restore-keys: ${{ runner.os }}-build-${{ env.cache-name }}-${{ matrix.python-version }}-${{ matrix.plone-version }}
- name: Buildout action
uses: IMIO/plonemeeting.portal.core/actions/buildout@master
with:
py-version: ${{ matrix.python-version }}
plone-version: ${{ matrix.plone-version }}
# - name: code analysis
# run: |
# pre-commit run --all-files
- name: Test
run: |
bin/test
PYTHON_VERSION: ${{ matrix.python-version }}
CACHE_KEY: ${{ runner.os }}-build-${{ env.cache-name }}-${{ matrix.python-version }}
TEST_COMMAND: bin/test
REQUIREMENTS_FILE: 'requirements-tests.txt'
MATTERMOST_WEBHOOK_URL: ${{ secrets.DELIB_MATTERMOST_WEBHOOK_URL }}
BUILDOUT_CONFIG_FILE: 'test-${{ matrix.plone-version }}.cfg'
26 changes: 0 additions & 26 deletions actions/buildout/action.yml

This file was deleted.

24 changes: 0 additions & 24 deletions actions/coverage/action.yml

This file was deleted.

0 comments on commit 28e6985

Please sign in to comment.