diff --git a/CHANGELOG.md b/CHANGELOG.md index 7efca290426df5ca64933afeea16476e9828dc0b..74b7b4ef27ad5897738a7e1830c79e563e75740d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [2.1.0](https://git.griefed.de/prosper/gitlab-ci-cd/compare/2.0.9...2.1.0) (2022-08-28) + + +### 🚀 Features + +* Add `act`(https://github.com/nektos/act) to image to allow for GitHub workflow runs even though we are not on GitHub :-] ([677604d](https://git.griefed.de/prosper/gitlab-ci-cd/commit/677604d899cac831f2720d4786fb10a8a6078934)) + ## [2.0.9](https://git.griefed.de/prosper/gitlab-ci-cd/compare/2.0.8...2.0.9) (2022-08-01) diff --git a/Dockerfile b/Dockerfile index e757f62343f205e96458d47e73c11e7de46541aa..7628dac424f5fb0a4e67878c80fef745cc509698 100644 --- a/Dockerfile +++ b/Dockerfile @@ -72,7 +72,11 @@ RUN \ npm install -g \ @quasar/cli && \ echo "**** Installing act ****" && \ +<<<<<<< HEAD curl https://raw.githubusercontent.com/nektos/act/b23bbefc365012886192e477a88d38a0909ecba1/install.sh | sudo bash && \ +======= + curl https://raw.githubusercontent.com/nektos/act/b23bbefc365012886192e477a88d38a0909ecba1/install.sh | bash && \ +>>>>>>> 209e392b842f6e294c372a52a55b65b3bcb205a3 echo "**** Cleanup ****" && \ rm -rf \ /var/cache/apk/* \