From 0eb3c3b1f64bbe24dfc802f283ebf9d4a0adcdaa Mon Sep 17 00:00:00 2001 From: Paul Smith Date: Tue, 24 Oct 2023 11:27:03 +0100 Subject: [PATCH] Use the mirsg composite actions --- .github/workflows/add-issue-to-project.yml | 15 +++++++++ .github/workflows/checks.yml | 39 +++++----------------- .github/workflows/molecule.yml | 25 +++----------- 3 files changed, 27 insertions(+), 52 deletions(-) create mode 100644 .github/workflows/add-issue-to-project.yml diff --git a/.github/workflows/add-issue-to-project.yml b/.github/workflows/add-issue-to-project.yml new file mode 100644 index 0000000..1d22782 --- /dev/null +++ b/.github/workflows/add-issue-to-project.yml @@ -0,0 +1,15 @@ +name: Add issue to project + +on: + issues: + types: + - opened + +jobs: + add-issue-to-project: + runs-on: ubuntu-latest + steps: + - uses: UCL-MIRSG/.github/actions/add-to-project@v0.25.0 + with: + app-id: ${{ secrets.APP_ID }} + app-pem: ${{ secrets.APP_PEM }} diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index d95a0c1..33a20a5 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -1,40 +1,17 @@ ---- -name: Pre-commit checks +name: Linting + on: - pull_request: push: branches: - main + - "renovate/**" + pull_request: jobs: - build: + linting: runs-on: ubuntu-latest steps: - - name: Checkout source - uses: actions/checkout@v4 - - - name: Set up python - uses: actions/setup-python@v4 - with: - python-version: 3.9 - - - name: Set PY - run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV - - - name: Cache pre-commit install - uses: actions/cache@v3 + - uses: UCL-MIRSG/.github/actions/linting@v0.25.0 with: - path: | - ${{ env.pythonLocation }} - ~/.cache/pre-commit - key: | - pre-commit-${{ env.PY }}-${{ hashFiles('.pre-commit-config.yaml') }} - - - name: Install dependencies - run: pip install pre-commit - - - name: Install pre-commit hooks - run: pre-commit install - - - name: Run pre-commit - run: pre-commit run --all-files --color always + ansible-roles-config: ./meta/requirements.yml + pre-commit-config: ./.pre-commit-config.yaml diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml index c6bd20d..acbfdf8 100644 --- a/.github/workflows/molecule.yml +++ b/.github/workflows/molecule.yml @@ -1,4 +1,4 @@ -name: "mirsg.docker" +name: Molecule Test on: pull_request: push: @@ -14,28 +14,11 @@ jobs: molecule_scenario: - centos7 - rocky8 - env: PY_COLORS: 1 ANSIBLE_FORCE_COLOR: 1 - steps: - - name: Check out code - uses: actions/checkout@v4 - - - name: Set up Python 3.9 - uses: actions/setup-python@v4 + - name: Run `molecule test` + uses: UCL-MIRSG/.github/actions/molecule-test@v0.25.0 with: - python-version: 3.9 - - - name: Install test dependencies - run: | - sudo apt-get update && sudo apt-get -y install rsync - python3 -m pip install --upgrade pip - python3 -m pip install ansible ansible-lint molecule molecule-plugins[docker] docker requests==2.29.0 - - - name: Run role tests - run: >- - molecule --version && - ansible --version && - molecule --debug test -s ${{ matrix.molecule_scenario }} + scenario: ${{ matrix.molecule_scenario }}