From 8813dbffdc4499878d2931102d9fe561f284fa1c Mon Sep 17 00:00:00 2001 From: "Florine W. Dekker" Date: Wed, 29 Nov 2023 17:45:51 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=8F=B9=20mommy=20patches=20homebrew=20and?= =?UTF-8?q?=20aur=20during=20tests~?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/cd.yml | 1 - .github/workflows/ci.yml | 14 +++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 0315657..6d3b683 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -247,7 +247,6 @@ jobs: echo "::endgroup::" echo "::group::Commit changes" - git add --all git config --global user.name "FWDekkerBot" git config --global user.email "bot@fwdekker.com" git commit -am "🔖 mommy added package mommy $MOMMY_VERSION~" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8c6fa19..7036880 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -56,6 +56,12 @@ jobs: repository: FWDekker/homebrew-mommy path: homebrew-mommy ref: dev + - name: Patch homebrew-mommy + working-directory: homebrew-mommy + run: | + # Point the formula to the commit that is being tested in this workflow + sed -i -e "s|head \(.*\), branch: .*|head \1, revision: \"${{ github.sha }}\"|g" mommy.rb + git -c user.name="ignore" -c user.email="ignore" commit -am "ignore" - name: Test Homebrew package run: | echo "::group::Enable Homebrew" @@ -163,7 +169,7 @@ jobs: working-directory: ./aur-mommy/ run: | echo "::group::Patch" - sudo -u build ./update.sh dev + sudo -u build ./update.sh "${{ github.sha }}" echo "::endgroup::" echo "::group::Build and install" @@ -312,6 +318,12 @@ jobs: repository: FWDekker/homebrew-mommy path: homebrew-mommy ref: dev + - name: Patch homebrew-mommy + working-directory: homebrew-mommy + run: | + # Point the formula to the commit that is being tested in this workflow + sed -i -e "s|head \(.*\), branch: .*|head \1, revision: \"${{ github.sha }}\"|g" mommy.rb + git -c user.name="ignore" -c user.email="ignore" commit -am "ignore" - name: Test Homebrew package run: | echo "::group::Enable Homebrew"