diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 077fafa..3e3a489 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -66,8 +66,7 @@ jobs: artifacts: 'bitwarden.sh, run.sh, bitwarden.ps1, - run.ps1, - version.json' + run.ps1' commit: ${{ github.sha }} tag: "v${{ github.event.inputs.release_version }}" name: "Version ${{ github.event.inputs.release_version }}" diff --git a/.github/workflows/update-links.yml b/.github/workflows/update-links.yml index 9c8cb02..77eda4d 100644 --- a/.github/workflows/update-links.yml +++ b/.github/workflows/update-links.yml @@ -36,14 +36,6 @@ jobs: echo "::set-output name=value::$GITHUB_REF_NAME" fi - - name: Update Bitwarden Version Link - uses: bitwarden/gh-actions/update-rebrandly-link@340a677ffb0c53e50ca67cd2c12044cd7f7fc725 - with: - apikey: ${{ steps.retrieve-secrets.outputs.rebrandly-apikey }} - domain: "go.btwrdn.co" - slashtag: "bw-sh-versions" - destination: "https://github.com/bitwarden/self-host/releases/download/${{ steps.tag-name.outputs.value }}/version.json" - - name: Update Bitwarden Script PowerShell Link uses: bitwarden/gh-actions/update-rebrandly-link@340a677ffb0c53e50ca67cd2c12044cd7f7fc725 with: diff --git a/.github/workflows/update-versions.yml b/.github/workflows/update-versions.yml index 33e835c..9efe2cc 100644 --- a/.github/workflows/update-versions.yml +++ b/.github/workflows/update-versions.yml @@ -33,7 +33,7 @@ jobs: env: LATEST_CORE_VERSION: ${{ steps.get-core.outputs.version }} run: | - CORE_VERSION=$(grep '^ *"coreVersion":' version.json | awk -F\: '{ print $2 }' | sed -e 's/,$//' -e 's/^"//' -e 's/"$//') + CORE_VERSION=$(sed -r -n "s/COREVERSION=\"([0-9]+\.[0-9]+\.[0-9]+)\"/\1/p" bitwarden.sh) echo "Core Version: $CORE_VERSION" echo "Latest Core Version: $LATEST_CORE_VERSION" if [ "$CORE_VERSION" != "$LATEST_CORE_VERSION" ]; then @@ -54,7 +54,7 @@ jobs: env: LATEST_WEB_VERSION: ${{ steps.get-web.outputs.version }} run: | - WEB_VERSION=$(grep '^ *"webVersion":' version.json | awk -F\: '{ print $2 }' | sed -e 's/,$//' -e 's/^"//' -e 's/"$//') + WEB_VERSION=$(sed -r -n "s/WEBVERSION=\"([0-9]+\.[0-9]+\.[0-9]+)\"/\1/p" bitwarden.sh) echo "Web Version: $WEB_VERSION" echo "Latest Web Version: $LATEST_WEB_VERSION" if [ "$WEB_VERSION" != "$LATEST_WEB_VERSION" ]; then @@ -75,7 +75,7 @@ jobs: env: LATEST_KEY_CONNECTOR_VERSION: ${{ steps.get-key-connector.outputs.version }} run: | - KEY_CONNECTOR_VERSION=$(grep '^ *"keyConnectorVersion":' version.json | awk -F\: '{ print $2 }' | sed -e 's/,$//' -e 's/^"//' -e 's/"$//') + KEY_CONNECTOR_VERSION=$(sed -r -n "s/KEYCONNECTORVERSION=\"([0-9]+\.[0-9]+\.[0-9]+)\"/\1/p" bitwarden.sh) echo "Key Connector Version: $KEY_CONNECTOR_VERSION" echo "Latest Key Connector Version: $LATEST_KEY_CONNECTOR_VERSION" if [ "$KEY_CONNECTOR_VERSION" != "$LATEST_KEY_CONNECTOR_VERSION" ]; then @@ -111,17 +111,23 @@ jobs: - name: Update Core Version env: VERSION: ${{ needs.setup.outputs.core_version }} - run: sed -i -e '/"coreVersion":/ s/"coreVersion":[^,]*/"coreVersion":"' $VERSION'"/' version.json + run: | + sed -i -e "/^\s*COREVERSION\s*=\s*/s/[0-9]\+.[0-9]\+.[0-9]\+/$VERSION/" bitwarden.sh + sed -i -e "/^\s*\$coreVersion\s*=\s*/s/[0-9]\+.[0-9]\+.[0-9]\+/$VERSION/" bitwarden.ps1 - name: Update Web Version env: VERSION: ${{ needs.setup.outputs.web_version }} - run: sed -i -e '/"webVersion":/ s/"webVersion":[^,]*/"webVersion":"'$VERSION'"/' version.json + run: | + sed -i -e "/^\s*WEBVERSION\s*=\s*/s/[0-9]\+.[0-9]\+.[0-9]\+/$VERSION/" bitwarden.sh + sed -i -e "/^\s*\$webVersion\s*=\s*/s/[0-9]\+.[0-9]\+.[0-9]\+/$VERSION/" bitwarden.ps1 - name: Update Key Connector Version env: VERSION: ${{ needs.setup.outputs.key_connector_version }} - run: sed -i -e '/"keyConnectorVersion":/ s/"keyConnectorVersion":[^,]*/"keyConnectorVersion":"'$VERSION'"/' version.json + run: | + sed -i -e "/^\s*KEYCONNECTORVERSION\s*=\s*/s/[0-9]\+.[0-9]\+.[0-9]\+/$VERSION/" bitwarden.sh + sed -i -e "/^\s*\$keyConnectorVersion\s*=\s*/s/[0-9]\+.[0-9]\+.[0-9]\+/$VERSION/" bitwarden.ps1 - name: Commit updated files run: | @@ -152,4 +158,4 @@ jobs: - [X] Other ## Objective - Automated version updates to core, web, and key-connector versions in `version.json`." + Automated version updates to core, web, and key-connector versions in bitwarden.sh and bitwarden.ps1." diff --git a/bitwarden.ps1 b/bitwarden.ps1 index 5f3c285..7c631c9 100644 --- a/bitwarden.ps1 +++ b/bitwarden.ps1 @@ -26,12 +26,11 @@ if ($output -eq "") { $scriptsDir = "${output}\scripts" $bitwardenScriptUrl = "https://go.btwrdn.co/bw-ps" $runScriptUrl = "https://go.btwrdn.co/bw-ps-run" -$versionEndpoint = "https://go.btwrdn.co/bw-sh-versions" # Please do not create pull requests modifying the version numbers. -$coreVersion = (Invoke-RestMethod -Uri $versionEndpoint).versions.coreVersion -$webVersion = (Invoke-RestMethod -Uri $versionEndpoint).versions.webVersion -$keyConnectorVersion = (Invoke-RestMethod -Uri $versionEndpoint).versions.keyConnectorVersion +$coreVersion = "1.47.1" +$webVersion = "2.27.0" +$keyConnectorVersion = "1.0.1" # Functions diff --git a/bitwarden.sh b/bitwarden.sh index 980299b..b2ac215 100755 --- a/bitwarden.sh +++ b/bitwarden.sh @@ -39,16 +39,11 @@ fi SCRIPTS_DIR="$OUTPUT/scripts" BITWARDEN_SCRIPT_URL="https://go.btwrdn.co/bw-sh" RUN_SCRIPT_URL="https://go.btwrdn.co/bw-sh-run" -VERSION_ENDPOINT="https://go.btwrdn.co/bw-sh-versions" # Please do not create pull requests modifying the version numbers. -function getVersion() { - echo $(curl -sL $VERSION_ENDPOINT | grep '^ *"'${1}'":' | awk -F\: '{ print $2 }' | sed -e 's/,$//' -e 's/^"//' -e 's/"$//') -} - -COREVERSION=$(getVersion coreVersion) -WEBVERSION=$(getVersion webVersion) -KEYCONNECTORVERSION=$(getVersion keyConnectorVersion) +COREVERSION="1.47.1" +WEBVERSION="2.27.0" +KEYCONNECTORVERSION="1.0.1" echo "bitwarden.sh version $COREVERSION" docker --version diff --git a/version.json b/version.json deleted file mode 100644 index 2d7874b..0000000 --- a/version.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "versions": { - "coreVersion":"1.47.1", - "webVersion":"2.27.0", - "keyConnectorVersion":"1.0.1" - } -} \ No newline at end of file