Merge pull request #3 from alcaeus/fix-actions

Fix actions

Author: blink1073

README.md

@@ -69,8 +69,3 @@ You can also supply multiple space-separated filenames to sign a list of files:
     artifactory_username: ${{ secrets.ARTIFACTORY_USER }}
     artifactory_password: ${{ secrets.ARTIFACTORY_PASSWORD }}
 ```
-
-### setup
-
-The setup action is used by `git-sign` and `gpg-sign` to create an env file and
-sign in to artifactory. It can also be used standalone.

garasign/git-sign/action.yml

@@ -1,5 +1,5 @@
-name: "Sign artifact using garasign"
-description: "Signs a release artifact"
+name: "Run git actions in a signing container"
+description: "Allows running arbitrary git actions in a container with GPG keys loaded"
 inputs:
   command:
     description: "Command to run inside the container"
@@ -29,15 +29,22 @@ inputs:
 runs:
   using: composite
   steps:
-    - name: Prepare garasign container
+    - name: Create the envfile
       if: ${{ inputs.skip_setup == 'false' }}
-      uses: ./.github/actions/garasign/setup
+      run: |
+        cat << EOF > envfile
+        GRS_CONFIG_USER1_USERNAME=${{ inputs.garasign_username }}
+        GRS_CONFIG_USER1_PASSWORD=${{ inputs.garasign_password }}
+        EOF
+      shell: bash
+
+    - name: Log in to artifactory
+      if: ${{ inputs.skip_setup == 'false' }}
+      uses: redhat-actions/podman-login@v1
       with:
-        garasign_username: ${{ inputs.garasign_username }}
-        garasign_password: ${{ inputs.garasign_password }}
-        artifactory_username: ${{ inputs.artifactory_username }}
-        artifactory_password: ${{ inputs.artifactory_password }}
-        artifactory_registry: ${{ inputs.artifactory_registry }}
+        username: ${{ inputs.artifactory_username }}
+        password: ${{ inputs.artifactory_password }}
+        registry: ${{ inputs.artifactory_registry }}
 
     - name: "Run git command"
       run: |

garasign/gpg-sign/action.yml

@@ -29,27 +29,30 @@ inputs:
 runs:
   using: composite
   steps:
-    - name: Prepare garasign container
+    - name: Create the envfile
       if: ${{ inputs.skip_setup == 'false' }}
-      uses: ./.github/actions/garasign/setup
+      run: |
+        cat << EOF > envfile
+        GRS_CONFIG_USER1_USERNAME=${{ inputs.garasign_username }}
+        GRS_CONFIG_USER1_PASSWORD=${{ inputs.garasign_password }}
+        EOF
+      shell: bash
+
+    - name: Log in to artifactory
+      if: ${{ inputs.skip_setup == 'false' }}
+      uses: redhat-actions/podman-login@v1
       with:
-        garasign_username: ${{ inputs.garasign_username }}
-        garasign_password: ${{ inputs.garasign_password }}
-        artifactory_username: ${{ inputs.artifactory_username }}
-        artifactory_password: ${{ inputs.artifactory_password }}
-        artifactory_registry: ${{ inputs.artifactory_registry }}
+        username: ${{ inputs.artifactory_username }}
+        password: ${{ inputs.artifactory_password }}
+        registry: ${{ inputs.artifactory_registry }}
 
-    - name: "Create detached signature for filename"
+    - name: "Create detached signature for file"
       run: |
-        export filenames="${{ inputs.filenames }}"
-        for filename in "${filenames[@]}"
-        do
-          podman run \
-            --env-file=envfile \
-            --rm \
-            -v $(pwd):$(pwd) \
-            -w $(pwd) \
-            ${{ inputs.artifactory_registry }}/${{ inputs.artifactory_image }} \
-            /bin/bash -c "gpgloader && gpg --detach-sign --armor --output ${{ inputs.filename }}.sig ${{ inputs.filename }}"
-        done
-      shell: bash
+        podman run \
+          --env-file=envfile \
+          --rm \
+          -v $(pwd):$(pwd) \
+          -w $(pwd) \
+          ${{ inputs.artifactory_registry }}/${{ inputs.artifactory_image }} \
+          /bin/bash -c 'gpgloader && for filename in "${{ inputs.filenames }}"; do gpg --detach-sign --armor --output ${filename}.sig ${filename}; done'
+      shell: bash