From a545ceaec90f2df9b3b2c6252ab36a4004a3a742 Mon Sep 17 00:00:00 2001
From: Ryan <me@hackerc.at>
Date: Wed, 8 Dec 2021 19:49:33 +0100
Subject: [PATCH] Fix and test choco action (#911)

* ci(choco): fix action

Signed-off-by: hackercat <me@hackerc.at>

* fix(editorconfig): force style for all files, fix typo

Signed-off-by: hackercat <me@hackerc.at>

* ci(choco): test choco action

Signed-off-by: hackercat <me@hackerc.at>

* fix(editorconfig): unformat Dockerfile/sh

Signed-off-by: hackercat <me@hackerc.at>
---
 .editorconfig                       | 13 +++++++++----
 .github/actions/choco/Dockerfile    | 15 ++++++++-------
 .github/actions/choco/action.yml    |  8 ++++++--
 .github/actions/choco/entrypoint.sh |  6 ++++--
 .github/workflows/checks.yml        |  4 ++++
 .github/workflows/release.yml       |  1 +
 6 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 07a45c4f..4c95ea48 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -5,12 +5,17 @@ end_of_line = lf
 charset = utf-8
 insert_final_newline = true
 trim_trailing_whitespace = true
-
-# Override for Makefile
-[{Makefile, makefile, GNUmakefile}]
 indent_style = tab
 indent_size = 4
 
-[*.{yml.yaml,json}]
+[*.sh]
+indent_style = space
+indent_size = 2
+
+[Dockerfile]
+indent_style = unset
+indent_size = unset
+
+[*.{yml,yaml,json}]
 indent_style = space
 indent_size = 2
diff --git a/.github/actions/choco/Dockerfile b/.github/actions/choco/Dockerfile
index 1661e9df..9e1bb107 100644
--- a/.github/actions/choco/Dockerfile
+++ b/.github/actions/choco/Dockerfile
@@ -2,18 +2,19 @@ FROM alpine:latest
 
 ARG CHOCOVERSION=0.11.3
 
-RUN apk add --no-cache bash ca-certificates \
-  && apk --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing add mono-dev \
+RUN apk add --no-cache bash ca-certificates git \
+  && apk --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing add mono mono-dev \
   && cert-sync /etc/ssl/certs/ca-certificates.crt \
-  && wget "https://github.com/chocolatey/choco/archive/${CHOCOVERSION}.tar.gz" \
-  && tar -xzf "${CHOCOVERSION}.tar.gz" \
-  && mv "choco-${CHOCOVERSION}" /opt/chocolatey \
+  && wget "https://github.com/chocolatey/choco/archive/${CHOCOVERSION}.tar.gz" -O- | tar -xzf - \
+  && cd choco-"${CHOCOVERSION}" \
   && chmod +x build.sh zip.sh \
   && ./build.sh -v \
-  && ln -sf /opt /opt/chocolatey/opt \
+  && mv ./code_drop/chocolatey/console /opt/chocolatey \
   && mkdir -p /opt/chocolatey/lib \
-  && apk del ca-certificates \
+  && rm -rf /choco-"${CHOCOVERSION}" \
+  && apk del mono-dev \
   && rm -rf /var/cache/apk/*
 
+ENV ChocolateyInstall=/opt/chocolatey
 COPY entrypoint.sh /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/.github/actions/choco/action.yml b/.github/actions/choco/action.yml
index 75903be9..28756f99 100644
--- a/.github/actions/choco/action.yml
+++ b/.github/actions/choco/action.yml
@@ -3,10 +3,14 @@ description: 'Create the choco package and push it'
 inputs:
   version:
     description: 'Version of package'
-    required: true
+    required: false
   apiKey:
     description: 'API Key for chocolately'
-    required: true
+    required: false
+  push:
+    description: 'Option for if package is going to be pushed'
+    required: false
+    default: 'false'
 runs:
   using: 'docker'
   image: 'Dockerfile'
diff --git a/.github/actions/choco/entrypoint.sh b/.github/actions/choco/entrypoint.sh
index 83e25711..fb26644f 100755
--- a/.github/actions/choco/entrypoint.sh
+++ b/.github/actions/choco/entrypoint.sh
@@ -3,7 +3,7 @@
 set -e
 
 function choco {
-  mono /opt/chocolatey/code_drop/chocolatey/choco.exe "$@" --allow-unofficial --nocolor
+  mono /opt/chocolatey/choco.exe "$@" --allow-unofficial --nocolor
 }
 
 function get_version {
@@ -26,4 +26,6 @@ cp LICENSE tools/LICENSE.txt
 cp VERIFICATION tools/VERIFICATION.txt
 cp dist/act_windows_amd64/act.exe tools/
 choco pack act-cli.nuspec --version ${VERSION}
-choco push act-cli.${VERSION}.nupkg --api-key ${INPUT_APIKEY} -s https://push.chocolatey.org/ --timeout 180
+if [[ "$INPUT_PUSH" == "true" ]]; then
+  choco push act-cli.${VERSION}.nupkg --api-key ${INPUT_APIKEY} -s https://push.chocolatey.org/ --timeout 180
+fi
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 21d520e9..ae43ebd3 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -149,3 +149,7 @@ jobs:
         with:
           name: act-macos-arm64
           path: dist/act_darwin_arm64/act
+      - name: Chocolatey
+        uses: ./.github/actions/choco
+        with:
+          version: v0.0.0-pr
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index de1c3999..f9b28c2d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -37,3 +37,4 @@ jobs:
         with:
           version: ${{ github.ref }}
           apiKey: ${{ secrets.CHOCO_APIKEY }}
+          push: true