From 8d624937744abf6ed3ce4d521178e1d62f1dfc64 Mon Sep 17 00:00:00 2001 From: Fabian Koller Date: Fri, 22 Jan 2021 11:10:56 +0100 Subject: [PATCH] Adapt github action to build PR version --- .github/workflows/ansible.yml | 23 ++++++++++++++++++++++- ansible/molecule/fresh/converge.yml | 6 ++++++ ansible/molecule/update/converge.yml | 5 ++--- ansible/molecule/update/prepare.yml | 2 +- ansible/tasks/install-source.yml | 4 +--- 5 files changed, 32 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ansible.yml b/.github/workflows/ansible.yml index 646c7ff81..60589f87d 100644 --- a/.github/workflows/ansible.yml +++ b/.github/workflows/ansible.yml @@ -5,7 +5,7 @@ on: [push, pull_request] jobs: # https://molecule.readthedocs.io/en/latest/ci.html#github-actions - test: + test-fresh: runs-on: ubuntu-latest # https://docs.github.com/en/free-pro-team@latest/actions/reference/context-and-expression-syntax-for-github-actions#github-context if: github.event_name == 'pull_request' || (github.event_name == 'push' && contains(github.ref, 'refs/heads/')) @@ -31,6 +31,27 @@ jobs: cd ansible molecule test -s fresh working-directory: "${{ github.repository }}" + test-update: + runs-on: ubuntu-latest + # https://docs.github.com/en/free-pro-team@latest/actions/reference/context-and-expression-syntax-for-github-actions#github-context + if: github.event_name == 'pull_request' || (github.event_name == 'push' && contains(github.ref, 'refs/heads/')) + steps: + - name: Check out the codebase + uses: actions/checkout@v2 + with: + path: "${{ github.repository }}" + - name: Set up Python + uses: actions/setup-python@v2 + - name: Set up Docker + uses: docker-practice/actions-setup-docker@master + - name: Install dependencies + run: | + python3 -m pip install --upgrade pip + python3 -m pip install molecule[ansible,docker] + ansible --version + docker --version + molecule --version + python --version - name: Test release update with molecule run: | cd ansible diff --git a/ansible/molecule/fresh/converge.yml b/ansible/molecule/fresh/converge.yml index 99e25677b..39d20050d 100644 --- a/ansible/molecule/fresh/converge.yml +++ b/ansible/molecule/fresh/converge.yml @@ -2,6 +2,12 @@ - name: fresh installation hosts: all tasks: + - name: set github ref as version when available + set_fact: + paperlessng_version: "{{ lookup('env', 'GITHUB_REF') | default('latest', True) }}" + - name: debug + debug: + var: paperlessng_version - name: install paperless-ng with default parameters include_role: name: ansible diff --git a/ansible/molecule/update/converge.yml b/ansible/molecule/update/converge.yml index b19a5981a..f5f9b17c2 100644 --- a/ansible/molecule/update/converge.yml +++ b/ansible/molecule/update/converge.yml @@ -2,10 +2,9 @@ - name: update previous release to newest release hosts: all tasks: - - name: set current version as installation target + - name: set github ref as version when available set_fact: - paperlessng_version: 0.9.14 - + paperlessng_version: "{{ lookup('env', 'GITHUB_REF') | default('latest', True) }}" - name: update to newest paperless-ng release include_role: name: ansible diff --git a/ansible/molecule/update/prepare.yml b/ansible/molecule/update/prepare.yml index 6f3734329..138ebdfce 100644 --- a/ansible/molecule/update/prepare.yml +++ b/ansible/molecule/update/prepare.yml @@ -3,7 +3,7 @@ tasks: - name: set previous version as installation target set_fact: - paperlessng_version: 0.9.13 + paperlessng_version: 1.0.0 - name: install previous paperless-ng release include_role: diff --git a/ansible/tasks/install-source.yml b/ansible/tasks/install-source.yml index 823445dd1..8f6dc0e03 100644 --- a/ansible/tasks/install-source.yml +++ b/ansible/tasks/install-source.yml @@ -18,7 +18,6 @@ dest: "{{ gitdir.path }}" version: "{{ paperlessng_version }}" refspec: "+refs/pull/*:refs/pull/*" - when: '"No such file or directory" in paperlessng_current_version.stderr or paperlessng_current_version.stdout != paperlessng_version | string' - name: compile frontend command: @@ -31,6 +30,7 @@ - npm install - ./node_modules/.bin/ng build --prod +# TODO run dev in separate virtualenv - name: install pipenv pip: name: @@ -44,7 +44,6 @@ regexp: '^python_version = ".+"$' line: python_version = "3" -# TODO run dev in separate virtualenv - name: install Pipfile dependencies command: cmd: pipenv install --dev @@ -125,7 +124,6 @@ src: "{{ gitdir.path }}/paperless-ng-{{ paperlessng_version }}.tar.xz" remote_src: yes dest: "{{ tempdir.path }}" - when: '"No such file or directory" in paperlessng_current_version.stderr or paperlessng_current_version.stdout != paperlessng_version | string' - name: remove temporary git directory file: