diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index f9ea35b..88553a3 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -7,14 +7,14 @@ jobs: steps: - name: checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: get-hash id: hash run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)" - name: run-build run: python3 build_package.py --set-version ${{ steps.hash.outputs.sha_short }} - name: artifact package - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: package path: dist/weewx-json_${{ steps.hash.outputs.sha_short }}.tar.gz diff --git a/CHANGELOG.md b/CHANGELOG.md index b2372c1..4db2e31 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ Upcoming -------- +* Fixed a warning due to the use of `is` comparison with a literal instead of `==` 1.2 --- diff --git a/skins/JSON/current_minimal.json.tmpl b/skins/JSON/current_minimal.json.tmpl index 5f5cf2f..a69b92a 100644 --- a/skins/JSON/current_minimal.json.tmpl +++ b/skins/JSON/current_minimal.json.tmpl @@ -9,7 +9,7 @@ }, "generation": { - #if $Extras.timestamp_fmt is "human" + #if $Extras.timestamp_fmt == "human" "time": "$current.dateTime.format("%a, %d %b %Y %H:%M:%S %Z")", #else "time": "$current.dateTime.format("%Y-%m-%dT%H:%M:%S%z")", diff --git a/skins/JSON/weewx.json.tmpl b/skins/JSON/weewx.json.tmpl index 3129370..4a30d0d 100644 --- a/skins/JSON/weewx.json.tmpl +++ b/skins/JSON/weewx.json.tmpl @@ -9,7 +9,7 @@ }, "generation": { - #if $Extras.timestamp_fmt is "human" + #if $Extras.timestamp_fmt == "human" "time": "$current.dateTime.format("%a, %d %b %Y %H:%M:%S %Z")", #else "time": "$current.dateTime.format("%Y-%m-%dT%H:%M:%S%z")",