Skip to content

Commit 2631381

Browse files
Change to use env over output where possible
1 parent f89171f commit 2631381

1 file changed

Lines changed: 20 additions & 18 deletions

File tree

.github/workflows/new_device.yaml

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -70,17 +70,19 @@ jobs:
7070
devices.append(new_device)
7171
7272
# Save manufacturer and model for later use
73-
set_output("branch", "_".join(re.findall(r"\w+",f"{new_device['manufacturer']} {new_device['model']} {new_device.get('model_id', '')} {new_device.get('hw_version', '')})".lower())))
74-
set_output("manufacturer", new_device['manufacturer'])
75-
set_output("model", new_device['model'])
76-
set_output("model_id", new_device.get('model_id', ''))
77-
set_output("hw_version", new_device.get('hw_version', ''))
78-
set_output("bqt", f"{numeric_quantity}x {new_device['battery_type']}")
73+
set_env("BRANCH", "_".join(re.findall(r"\w+",f"{new_device['manufacturer']} {new_device['model']} {new_device.get('model_id', '')} {new_device.get('hw_version', '')})".lower())))
74+
set_env("MANUFACTURER", new_device['manufacturer'])
75+
set_env("MODEL", new_device['model'])
76+
set_env("MODEL_ID", new_device.get('model_id', ''))
77+
set_env("HW_VERSION", new_device.get('hw_version', ''))
78+
set_env("BQT", f"{numeric_quantity}x {new_device['battery_type']}")
7979
8080
if duplicate_found:
81-
set_output("mode", "updates")
81+
set_env("MODE", "updates")
82+
set_env("TITLE_MODE", "Update")
8283
else:
83-
set_output("mode", "adds")
84+
set_env("MODE", "adds")
85+
set_env("TITLE_MODE", "Add")
8486
8587
with open("library/library.json", "w") as f:
8688
f.write(json.dumps(devices_json, indent=4))
@@ -92,7 +94,7 @@ jobs:
9294
--header 'Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}' \
9395
--header 'Content-Type: application/json' \
9496
--data '{
95-
"title": "Device: ${{ steps.update-json.outputs.manufacturer }} - ${{ steps.update-json.outputs.model }}"
97+
"title": "Device: ${{ env.MANUFACTURER }} - ${{ env.MODEL }}"
9698
}'
9799
98100
- name: Validate JSON
@@ -104,20 +106,20 @@ jobs:
104106
- name: Create pull request
105107
uses: peter-evans/create-pull-request@v7
106108
with:
107-
commit-message: "Update device: ${{ steps.update-json.outputs.model }} by ${{ steps.update-json.outputs.manufacturer }}"
108-
title: "Device: ${{ steps.update-json.outputs.manufacturer }} - ${{ steps.update-json.outputs.model }}"
109+
commit-message: "${{ env.TITLE_MODE }} device: ${{ env.MODEL }} by ${{ env.MANUFACTURER }}"
110+
title: "${{ env.TITLE_MODE }} device: ${{ env.MANUFACTURER }} - ${{ env.MODEL }}"
109111
body: |
110-
This pull request ${{ steps.update-json.outputs.mode }} the device information for:
111-
Manufacturer: ${{ steps.update-json.outputs.manufacturer }}
112-
Model: ${{ steps.update-json.outputs.model }}
113-
Model ID: ${{ steps.update-json.outputs.model_id }}
114-
Hardware: ${{ steps.update-json.outputs.hw_version }}
115-
Battery: ${{ steps.update-json.outputs.bqt }}
112+
This pull request ${{ env.MODE }} the device information for:
113+
Manufacturer: ${{ env.MANUFACTURER }}
114+
Model: ${{ env.MODEL }}
115+
Model ID: ${{ env.MODEL_ID }}
116+
Hardware: ${{ env.HW_VERSION }}
117+
Battery: ${{ env.BQT }}
116118
It closes issue #${{ github.event.issue.number }}
117119
118120
If Battery Notes is useful to you please
119121
[!["Buy Me A Coffee"](https://www.buymeacoffee.com/assets/img/custom_images/yellow_img.png)](https://www.buymeacoffee.com/codechimp)
120-
branch: "device-${{ steps.update-json.outputs.branch }}"
122+
branch: "device-${{ env.BRANCH }}"
121123

122124
- name: Close Issue
123125
run: gh issue close --comment "$BODY" ${{github.event.issue.number}}

0 commit comments

Comments
 (0)