diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b69af8bda..579e3a33a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -4,8 +4,7 @@ name: CI on: push: branches: - - dev - - master + - main pull_request: ~ env: diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index ffe4caafa..5b27fd671 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -4,7 +4,7 @@ on: push: # branches to consider in the event; optional, defaults to all branches: - - dev + - main jobs: update_release_draft: diff --git a/azure-pipelines-release.yml b/azure-pipelines-release.yml index 9fa7527e4..833a88bbb 100644 --- a/azure-pipelines-release.yml +++ b/azure-pipelines-release.yml @@ -4,18 +4,18 @@ trigger: batch: true branches: include: - - dev + - main tags: include: - "*" paths: include: - - supervisor/* - - rootfs/* - - requirements.txt - - setup.py - - Dockerfile - - build.json + - supervisor/* + - rootfs/* + - requirements.txt + - setup.py + - Dockerfile + - build.json pr: none variables: - name: versionBuilder diff --git a/azure-pipelines-wheels.yml b/azure-pipelines-wheels.yml index 1a7fb7947..8f46669d9 100644 --- a/azure-pipelines-wheels.yml +++ b/azure-pipelines-wheels.yml @@ -4,24 +4,23 @@ trigger: batch: true branches: include: - - dev + - main pr: none variables: - name: versionWheels - value: '1.13.0-3.8-alpine3.12' + value: "1.13.0-3.8-alpine3.12" resources: repositories: - repository: azure type: github - name: 'home-assistant/ci-azure' - endpoint: 'home-assistant' - + name: "home-assistant/ci-azure" + endpoint: "home-assistant" jobs: -- template: templates/azp-job-wheels.yaml@azure - parameters: - builderVersion: '$(versionWheels)' - builderApk: 'build-base;libffi-dev;openssl-dev' - builderPip: 'Cython' - skipBinary: 'aiohttp' - wheelsRequirement: 'requirements.txt' + - template: templates/azp-job-wheels.yaml@azure + parameters: + builderVersion: "$(versionWheels)" + builderApk: "build-base;libffi-dev;openssl-dev" + builderPip: "Cython" + skipBinary: "aiohttp" + wheelsRequirement: "requirements.txt" diff --git a/scripts/dev_version.sh b/scripts/dev_version.sh deleted file mode 100755 index ff899fdec..000000000 --- a/scripts/dev_version.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -set -eE - -commit_count="$(git rev-list --count --since=yesterday HEAD)" -calver_date="$(date "+%Y.%m.dev%d")" - -calver_version="${calver_date}${commit_count}" - -sed -i "s/SUPERVISOR_VERSION .*/SUPERVISOR_VERSION = \"${calver_version}\"/g" supervisor/const.py -echo "$calver_version"