diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 3ea6214..3293aff 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -42,7 +42,7 @@ jobs: build_cmd: - ./build-latest.sh - PRERELEASE=true ./build-latest.sh - - ./build-next.sh + - ./build.sh feature - ./build.sh develop docker_from: - '' # use the default of the build script diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1f0e317..eb47cfe 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,7 +14,7 @@ jobs: build_cmd: - ./build-latest.sh - PRERELEASE=true ./build-latest.sh - - ./build-next.sh + - ./build.sh feature - ./build.sh develop fail-fast: false runs-on: ubuntu-latest diff --git a/build-next.sh b/build-next.sh deleted file mode 100755 index 88f290b..0000000 --- a/build-next.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash -# Builds develop, develop-* and master branches of NetBox - -echo "▶️ $0 $*" - -### -# Checking for the presence of GITHUB_OAUTH_CLIENT_ID -# and GITHUB_OAUTH_CLIENT_SECRET -### -if [ -n "${GITHUB_OAUTH_CLIENT_ID}" ] && [ -n "${GITHUB_OAUTH_CLIENT_SECRET}" ]; then - echo "🗝 Performing authenticated Github API calls." - GITHUB_OAUTH_PARAMS="client_id=${GITHUB_OAUTH_CLIENT_ID}&client_secret=${GITHUB_OAUTH_CLIENT_SECRET}" -else - echo "🕶 Performing unauthenticated Github API calls. This might result in lower Github rate limits!" - GITHUB_OAUTH_PARAMS="" -fi - -### -# Calling Github to get the all branches -### -ORIGINAL_GITHUB_REPO="${SRC_ORG-netbox-community}/${SRC_REPO-netbox}" -GITHUB_REPO="${GITHUB_REPO-$ORIGINAL_GITHUB_REPO}" -URL_RELEASES="https://api.github.com/repos/${GITHUB_REPO}/branches?${GITHUB_OAUTH_PARAMS}" - -# Composing the JQ commans to extract the most recent version number -JQ_NEXT='map(.name) | .[] | scan("^[^v].+") | match("^(develop-).*") | .string' - -CURL="curl -sS" - -# Querying the Github API to fetch all branches -NEXT=$($CURL "${URL_RELEASES}" | jq -r "$JQ_NEXT") - -if [ -n "$NEXT" ]; then - # shellcheck disable=SC2068 - ./build.sh "${NEXT}" $@ -else - echo "No branch matching 'develop-*' found" - echo "::set-output name=skipped::true" -fi