diff --git a/.github/workflows/combine-bot-prs.yml b/.github/workflows/combine-bot-prs.yml index a3aa8f4204..abe21143d8 100644 --- a/.github/workflows/combine-bot-prs.yml +++ b/.github/workflows/combine-bot-prs.yml @@ -66,11 +66,7 @@ jobs: if (branch.startsWith('${{ github.event.inputs.branchPrefix }}')) { console.log('Branch matched prefix: ' + branch); let statusOK = true; - if ($ { - { - github.event.inputs.mustBeGreen - } - }) { + if (${{ github.event.inputs.mustBeGreen }}) { console.log('Checking green status: ' + branch); const stateQuery = `query($owner: String!, $repo: String!, $pull_number: Int!) { repository(owner: $owner, name: $repo) { @@ -93,9 +89,7 @@ jobs: pull_number: pull['number'] }; const result = await github.graphql(stateQuery, vars); - const [{ - commit - }] = result.repository.pullRequest.commits.nodes; + const [{ commit }] = result.repository.pullRequest.commits.nodes; const state = commit.statusCheckRollup.state console.log('Validating status: ' + state); if (state != 'SUCCESS') { @@ -144,11 +138,7 @@ jobs: let combinedPRs = []; let mergeFailedPRs = []; - for (const { - branch, - prString - } - of branchesAndPRStrings) { + for (const { branch, prString } of branchesAndPRStrings) { try { await github.rest.repos.merge({ owner: context.repo.owner, diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 2d3db05fa6..7995056d42 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -57,14 +57,13 @@ release: target_commitish: '{{ .Commit }}' header: > DefraDB v{{ .Major }}.{{ .Minor }} is a major pre-production release. - Until the stable version 1.0 is reached, - the SemVer minor patch number will denote notable releases, + Until the stable version 1.0 is reached, the SemVer minor patch number will denote notable releases, which will give the project freedom to experiment and explore potentially breaking changes. To get a full outline of the changes, we invite you to review the official changelog below. This release does include a Breaking Change to existing v{{ .Major }}.{{ .Minor }}.x databases. - If you need help migrating an existing deployment, - reach out at hello@source.network or join our Discord at https://discord.gg/w7jYQVJ/. + If you need help migrating an existing deployment, reach out at hello@source.network or join + our Discord at https://discord.gg/w7jYQVJ/. name_template: "v{{ .Version }} Release" diff --git a/Makefile b/Makefile index 1600d44f6c..56ff8cbcbe 100644 --- a/Makefile +++ b/Makefile @@ -129,40 +129,11 @@ deps\:lint-go: .PHONY: deps\:lint-yaml deps\:lint-yaml: -ifneq (, $(shell which yamllint)) - $(info YAML linter 'yamllint' already installed.) -else ifneq (, $(shell which pip)) - -pip install --user yamllint -else - $(info YAML linter 'yamllint' and `pip` both not found.) -endif -ifeq (, $(shell which yamllint)) # If yamllint still not installed then try this: - $(warning Try to install YAML linter 'yamllint' using package manager.) -ifeq ($(OS_PACKAGE_MANAGER),apt) - sudo apt -y install yamllint -else ifeq ($(OS_PACKAGE_MANAGER),yum) - sudo yum makecache --refresh - sudo yum -y install yamllint -else ifeq ($(OS_PACKAGE_MANAGER),pacman) - sudo pacman -S --noconfirm yamllint -else ifeq ($(OS_PACKAGE_MANAGER),dnf) - sudo dnf -y install yamllint -else ifeq ($(OS_PACKAGE_MANAGER),brew) - brew install yamllint -else ifeq ($(OS_GENERAL),Linux) # If none of the above but still linux, then try: - python -m ensurepip --upgrade -else ifeq ($(OS_GENERAL),Darwin) - python -m ensurepip --upgrade -else ifeq ($(OS_GENERAL),Windows) - py -m ensurepip --upgrade +ifeq (, $(shell which yamllint)) + $(info YAML linter 'yamllint' not found on the system, please install it.) + $(info Can try using your local package manager: $(OS_PACKAGE_MANAGER)) else - $(error "Could not install yamllint on your system.") -endif -endif -ifneq (, $(shell which yamllint)) - $(info YAML linter 'yamllint' is installed.) -else - $(error Could not install 'yamllint'.) + $(info YAML linter 'yamllint' already installed.) endif .PHONY: deps\:lint