Discharge7443/fleet
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

Fixes for releasing to stable channel (#18200)

Browse Source 
Bug fixes found while releasing fleetd `1.23.0` to `stable`.
This commit is contained in:
Lucas Manuel Rodriguez
2024-04-10 18:34:33 -03:00
committed by GitHub
parent 565e45c041
commit cfdce42970
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/tuf/README.md
-4
View File
@@ -175,8 +175,6 @@ KEYS_SOURCE_DIRECTORY=/Volumes/FLEET-TUF/keys \
TARGETS_PASSPHRASE_1PASSWORD_PATH="Private/TUF TARGETS/password" \
SNAPSHOT_PASSPHRASE_1PASSWORD_PATH="Private/TUF SNAPSHOT/password" \
TIMESTAMP_PASSPHRASE_1PASSWORD_PATH="Private/TUF TIMESTAMP/password" \
GITHUB_USERNAME=foobar \
GITHUB_TOKEN_1PASSWORD_PATH="Private/Github Token/password" \
PUSH_TO_REMOTE=1 \
./tools/tuf/releaser.sh
```
@@ -193,8 +191,6 @@ KEYS_SOURCE_DIRECTORY=/Volumes/FLEET-TUF/keys \
TARGETS_PASSPHRASE_1PASSWORD_PATH="Private/TUF TARGETS/password" \
SNAPSHOT_PASSPHRASE_1PASSWORD_PATH="Private/TUF SNAPSHOT/password" \
TIMESTAMP_PASSPHRASE_1PASSWORD_PATH="Private/TUF TIMESTAMP/password" \
GITHUB_USERNAME=foobar \
GITHUB_TOKEN_1PASSWORD_PATH="Private/Github Token/password" \
PUSH_TO_REMOTE=1 \
./tools/tuf/releaser.sh
```
tools/tuf/releaser.sh
+7 -2
View File
@@ -62,7 +62,10 @@ setup () {
prompt "AWS SSO login was successful, press any key to continue..."
fi
GITHUB_TOKEN=$(op read "op://$GITHUB_TOKEN_1PASSWORD_PATH")
# GITHUB_TOKEN is only necessary when releasing to edge.
if [[ -n $GITHUB_TOKEN_1PASSWORD_PATH ]]; then
GITHUB_TOKEN=$(op read "op://$GITHUB_TOKEN_1PASSWORD_PATH")
fi
# These need to be exported for use by `fleetctl updates` commands.
FLEET_TARGETS_PASSPHRASE=$(op read "op://$TARGETS_PASSPHRASE_1PASSWORD_PATH")
@@ -87,10 +90,11 @@ promote_component_edge_to_stable () {
component_name=$1
component_version=$2
version_parts=("${component_version//./ }")
IFS='.' read -r -a version_parts <<< "$component_version"
major=${version_parts[0]}
minor=${version_parts[1]}
pushd "$TUF_DIRECTORY"
case $component_name in
orbit)
fleetctl updates add --target "$REPOSITORY_DIRECTORY/targets/orbit/macos/edge/orbit" --platform macos --name orbit --version "$component_version" -t "$major.$minor" -t "$major" -t stable
@@ -112,6 +116,7 @@ promote_component_edge_to_stable () {
exit 1
;;
esac
popd
}
promote_edge_to_stable () {