From 412cc20be55c7e1330a9d324ae357a72640f8964 Mon Sep 17 00:00:00 2001
From: Michael Stenta <mike@mstenta.net>
Date: Tue, 19 Jan 2021 08:05:12 -0500
Subject: [PATCH] Revert "Include the latest commit SHA in the farmOS version."

This reverts commit 43970e4cf3eb36c583d2980f135fbf3e15622dcf.

See https://github.com/farmOS/farmOS/pull/401
---
 .github/workflows/run-tests.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 815b5fa6..601f140e 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -31,12 +31,12 @@ jobs:
       - name: Set FARMOS_VERSION for push event.
         if: ${{ !github.event.pull_request }}
         run: |
-          echo "FARMOS_VERSION=${GITHUB_REF:11}#${GITHUB_SHA}" >> $GITHUB_ENV
+          echo "FARMOS_VERSION=${GITHUB_REF:11}" >> $GITHUB_ENV
           echo "FARMOS_REPO=${GITHUB_REPOSITORY}" >> $GITHUB_ENV
       - name: Set FARMOS_VERSION for pull request event.
         if: ${{ github.event.pull_request }}
         run: |
-          echo "FARMOS_VERSION=${GITHUB_HEAD_REF}#${{ github.event.pull_request.head.sha }}" >> $GITHUB_ENV
+          echo "FARMOS_VERSION=${GITHUB_HEAD_REF}" >> $GITHUB_ENV
           echo "FARMOS_REPO=${{ github.event.pull_request.head.repo.full_name }}" >> $GITHUB_ENV
       - name: Build farmOS 2.x Docker image
         run: docker build --build-arg FARMOS_REPO=https://github.com/${FARMOS_REPO} --build-arg FARMOS_VERSION=${FARMOS_VERSION} -t farmos/farmos:2.x docker