Merge branch 'develop'

Signed-off-by: Pedro Lamas <pedrolamas@gmail.com>

Author: pedrolamas

.github/workflows/build.yml

@@ -108,6 +108,9 @@ jobs:
     needs: build
     if: ${{ github.ref == 'refs/heads/develop' }}
     runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+      contents: read
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -122,9 +125,18 @@ jobs:
         run: |
           cp ./server/config.json ./dist/config.json
 
+      - uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-region: us-east-1
+          role-to-assume: ${{ secrets.AWS_GITHUB_ACTIONS_ROLE }}
+
       - name: Deploy to Host
-        env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-        run: |
-          npm run deploy:host:dev
+        uses: reggionick/s3-deploy@v4
+        with:
+          folder: dist
+          bucket: ${{ secrets.DEV_S3_BUCKET_NAME }}
+          bucket-region: us-east-1
+          dist-id: ${{ secrets.DEV_CF_DISTRIBUTION_ID }}
+          delete-removed: true
+          no-cache: true
+          private: true

.github/workflows/release.yml

@@ -42,8 +42,7 @@ jobs:
       - name: Create Artifact
         run: |
           cd ./dist
-          zip -r fluidd.zip ./
-          cd ..
+          zip -r ../fluidd.zip ./
 
       - name: Get version from tag
         id: tag_name
@@ -78,25 +77,56 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./dist/fluidd.zip
+          asset_path: ./fluidd.zip
           asset_name: fluidd.zip
           asset_content_type: application/zip
 
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: fluidd-${{ github.sha }}.zip
+          path: ./dist
+
       - name: Publish Release
         uses: eregon/publish-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           release_id: ${{ steps.create_release.outputs.id }}
 
+  publish-web:
+    name: Deploy to Host
+    needs: build
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+      contents: read
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Download fluidd.zip
+        uses: actions/download-artifact@v4
+        with:
+          name: fluidd-${{ github.sha }}.zip
+          path: ./dist
+
       - name: Prepare Deploy
         run: |
-          rm ./dist/fluidd.zip
           cp ./server/config.json ./dist/config.json
 
+      - uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-region: us-east-1
+          role-to-assume: ${{ secrets.AWS_GITHUB_ACTIONS_ROLE }}
+
       - name: Deploy to Host
-        env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-        run: |
-          npm run deploy:host
+        uses: reggionick/s3-deploy@v4
+        with:
+          folder: dist
+          bucket: ${{ secrets.S3_BUCKET_NAME }}
+          bucket-region: us-east-1
+          dist-id: ${{ secrets.CF_DISTRIBUTION_ID }}
+          delete-removed: true
+          no-cache: true
+          private: true

docs/customize/hide_outputs.md

@@ -1,18 +1,18 @@
 ---
 layout: default
-title: Hide macros, output pins and fans
+title: Hide macros, output pins, fans and sensors
 parent: Customize
 nav_order: 3
 permalink: /customize/hide
 ---
 
-# Hide macros, output pins and fans
+# Hide macros, output pins, fans and sensors
 {: .no_toc }
 
 ---
 
-Fluidd allows you to hide macros, output pins and fans by prefixing them
-with an underscore (`_`).
+Fluidd allows you to hide macros, output pins, fans and sensors by prefixing
+them with an underscore (`_`).
 
 By doing this - you're removing them from Fluidd. This can be handy in
 situations where you have a large quantiy of macros, or whereby you have an
@@ -31,6 +31,11 @@ gcode:
 pin: z:P1.30
 ```
 
+```yaml
+[temperature_sensor _MCU]
+sensor_type: MCU
+```
+
 Macros can also be hidden directly from the Fluidd settings by toggling their
 visibility, in order to not change their name:  
 ![screenshot](/assets/images/macro_visibility.png)