diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 9665271..31a8d9f 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -29,8 +29,8 @@ jobs: run: | IMAGE_ID=${GITHUB_REPOSITORY,,} IMAGE_NAME=${IMAGE_ID#*/} - echo ::set-output name=image_id::$IMAGE_ID - echo ::set-output name=image_name::$IMAGE_NAME + echo "image_id=$IMAGE_ID" >> $GITHUB_ENV + echo "image_name=$IMAGE_NAME" >> $GITHUB_ENV docker build . --file Dockerfile -t $IMAGE_NAME - name: Login to Github Container Registry @@ -43,10 +43,10 @@ jobs: - name: Tag image id: tag_image run: | - IMAGE_NAME=${{ steps.build_image.outputs.image_name }} - IMAGE_ID=ghcr.io/${{ steps.build_image.outputs.image_id }} + IMAGE_NAME=${{ env.image_name }} + IMAGE_ID=ghcr.io/${{ env.image_id }} echo IMAGE_ID=$IMAGE_ID - echo ::set-output name=image_id::$IMAGE_ID + echo "image_id=$IMAGE_ID" >> $GITHUB_ENV # Strip git ref prefix from version VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,') @@ -55,7 +55,7 @@ jobs: # if version is master, set version to dev [[ "$VERSION" == "master" ]] && VERSION=dev echo VERSION=$VERSION - echo ::set-output name=version::$VERSION + echo "version=$VERSION" >> $GITHUB_ENV # tag dev or x.x.x docker tag $IMAGE_NAME $IMAGE_ID:$VERSION @@ -64,8 +64,8 @@ jobs: - name: Push images to registry run: | - VERSION=${{ steps.tag_image.outputs.version }} - IMAGE_ID=${{ steps.tag_image.outputs.image_id }} + VERSION=${{ env.version }} + IMAGE_ID=${{ env.image_id }} [[ "$VERSION" != "dev" ]] && docker push $IMAGE_ID:latest || true docker push $IMAGE_ID:$VERSION @@ -77,4 +77,4 @@ jobs: url: ${{ secrets.DEPLOY_URL }} method: POST headers: '{"Authentication": "Token ${{ secrets.DEPLOY_TOKEN }}"}' - payload: '{"version": "${{ steps.tag_image.outputs.version }}"}' + payload: '{"version": "${{ env.version }}"}' diff --git a/exts/dbconv.py b/exts/dbconv.py index 37eaedd..50f1513 100644 --- a/exts/dbconv.py +++ b/exts/dbconv.py @@ -187,7 +187,7 @@ def _calc_volt(db: float, ref: float): # testing code if __name__ == "__main__": - while(True): + while True: try: ip = input("> ").split() initial = float(ip[0])