From 8f1e95a0ceddb5296d4c9fbc102a4c91b85757d7 Mon Sep 17 00:00:00 2001
From: Fabian Koller <anokfireball@posteo.de>
Date: Fri, 26 Feb 2021 19:39:44 +0100
Subject: [PATCH] Fix GitHub actions

Follow-up to #630.
The check for the target git sha can does not work in the molecule step.
Instead expose the sha through an env variable in GitHub actions.
---
 .github/workflows/ansible.yml         | 2 ++
 ansible/molecule/default/converge.yml | 8 +-------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ansible.yml b/.github/workflows/ansible.yml
index c49ce2abc..7467806c9 100644
--- a/.github/workflows/ansible.yml
+++ b/.github/workflows/ansible.yml
@@ -48,6 +48,8 @@ jobs:
           molecule idempotence
           molecule verify
         working-directory: "${{ github.repository }}"
+        env:
+          TARGET_GITHUB_SHA: "${{ github.event.pull_request.head.sha }}"
   # # https://galaxy.ansible.com/docs/contributing/importing.html
   # release:
   #   runs-on: ubuntu-latest
diff --git a/ansible/molecule/default/converge.yml b/ansible/molecule/default/converge.yml
index c70c54d39..c7f43c877 100644
--- a/ansible/molecule/default/converge.yml
+++ b/ansible/molecule/default/converge.yml
@@ -2,15 +2,9 @@
 - name: update previous release to newest release
   hosts: all
   tasks:
-    - name: install git dependency
-      apt:
-        pkg: git
-    - name: obtain latest git hash in current tree
-      command: git rev-parse HEAD
-      register: git_hash
     - name: set current github commit as version when available
       set_fact:
-        paperlessng_version: "{{ git_hash.stdout }}"
+        paperlessng_version: "{{ lookup('env', 'TARGET_GITHUB_SHA') | default('master', True) }}"
     - name: update to newest paperless-ng release
       include_role:
         name: ansible