diff --git a/.github/workflows/jh-publish.yml b/.github/workflows/jh-publish.yml index 26b36bfd..3775886c 100644 --- a/.github/workflows/jh-publish.yml +++ b/.github/workflows/jh-publish.yml @@ -53,7 +53,7 @@ jobs: echo "docker=${docker[@]}" >> $GITHUB_OUTPUT - name: Login to GitHub Container Registry - uses: docker/login-action@v3.2.0 + uses: docker/login-action@v3.3.0 with: registry: ghcr.io username: ${{ github.repository_owner }} diff --git a/action.yml b/action.yml index 33d5d82e..a994e1d0 100644 --- a/action.yml +++ b/action.yml @@ -1,4 +1,4 @@ -name: "Home Assistant wheels builder" +name: "JH Home Assistant wheels builder" description: "Builds and publishes python wheels" inputs: tag: @@ -54,13 +54,13 @@ inputs: required: false wheels-host: description: "wheels host URL" - default: "wheels.hass.io" + default: "wheels.iot.jethome.ru" wheels-user: description: "User for wheels host" default: "wheels" wheels-index: description: "The wheels index URL" - default: "https://wheels.home-assistant.io" + default: "https://wheels.iot.jethome.ru" runs: using: "composite" @@ -69,7 +69,7 @@ runs: id: version run: | input="${GITHUB_ACTION_PATH##*/}" - if [[ "${input}" == "master" ]] || [[ -z "${input}" ]]; then + if [[ "${input}" == "master" ]] || [[ "${input}" == "master-jethub" ]] || [[ -z "${input}" ]]; then input="dev" fi echo "version=${input}" >> $GITHUB_OUTPUT @@ -84,14 +84,14 @@ runs: # Validate & update known_hosts ssh-keygen -y -e -f .ssh/id_rsa - ssh-keyscan -H ${{ inputs.wheels-host }} >> .ssh/known_hosts + ssh-keyscan -t rsa -H ${{ inputs.wheels-host }} >> .ssh/known_hosts chmod 600 .ssh/* fi - shell: bash id: pull run: | - name="ghcr.io/home-assistant/wheels/${{ inputs.arch }}/${{ inputs.tag }}/${{ inputs.abi }}:${{ steps.version.outputs.version }}" + name="ghcr.io/jethub-homeassistant/wheels/${{ inputs.arch }}/${{ inputs.tag }}/${{ inputs.abi }}:${{ steps.version.outputs.version }}" docker pull "$name" echo "name=$name" >> $GITHUB_OUTPUT @@ -160,7 +160,7 @@ runs: ${{ steps.pull.outputs.name }} \ --index "${{ inputs.wheels-index }}" \ --upload rsync \ - --remote "${{ inputs.wheels-user }}@${{ inputs.wheels-host }}:/opt/wheels" \ + --remote "${{ inputs.wheels-user }}@${{ inputs.wheels-host }}:/var/www/wheels" \ ${{ steps.options.outputs.build }} - shell: bash