fix: Update to MorphoCloud/MorphoCloudWorkflow@c43c035

MorphoCloud · Aug 15, 2024 · 25ab849 · 25ab849
1 parent 1ba6ab9
commit 25ab849
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 3 deletions.
diff --git a/.github/workflows/send-email.yml b/.github/workflows/send-email.yml
@@ -95,11 +95,32 @@ jobs:
 
             See details at https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
 
+      - name: Check if email is encoded
+        id: check_email_encryption
+        run: |
+          if [[ "$EMAIL" != *"@"* ]]; then
+            encoded="true"
+          else
+            encoded="false"
+          fi
+          echo "encoded=$encoded" >> $GITHUB_OUTPUT
+        env:
+          EMAIL: ${{ steps.extract.outputs.email }}
+
+      - name: Decode email
+        id: decode_email
+        uses: ./.github/actions/encode-decode-string
+        with:
+          input_string: ${{ steps.extract.outputs.email }}
+          encryption_key: ${{ secrets.STRING_ENCRYPTION_KEY }}
+          operation: "decode"
+          skip: ${{ steps.check_email_encryption.outputs.encoded == 'false' }}
+
       - name: Send mail (completed)
         id: send_email
         uses: ./.github/actions/send-email
         with:
-          to: ${{ steps.extract.outputs.email }}
+          to: ${{ steps.decode_email.outputs.output_string }}
           mail_server_username: ${{secrets.MAIL_USERNAME}}
           mail_server_password: ${{secrets.MAIL_PASSWORD}}
           instance_name: ${{ steps.define.outputs.instance_name }}

diff --git a/.github/workflows/update-request-status-label.yml b/.github/workflows/update-request-status-label.yml
@@ -32,8 +32,11 @@ jobs:
 
               add_label="status:$status_lowercase"
 
-              remove_labels=$(gh issue view $issue_number --json labels \
-                --jq '[.labels[].name | select(test("^status:")?)] | join(",")')
+              remove_labels=$(gh issue view $issue_number --json labels | \
+                jq \
+                  -r \
+                  --arg add_label "$add_label" \
+                  -c '[.labels[].name | select(test("^status:")?) | select(. != $add_label)] | join(",")')
 
               echo "Updating issue $issue_number adding label [$add_label] and removing labels [$remove_labels]"
 

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -31,3 +31,10 @@ repos:
       - id: check-github-actions
       - id: check-github-workflows
       - id: check-readthedocs
+
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: "v0.5.7"
+    hooks:
+      - id: ruff
+        args: [--fix, --show-fixes]
+      - id: ruff-format