diff options
| -rw-r--r-- | internal/discovery/.gitignore | 2 | ||||
| -rw-r--r-- | internal/discovery/organization_list.json | 1 | ||||
| -rw-r--r-- | internal/discovery/server_list.json | 1 | ||||
| -rwxr-xr-x | make_release.sh | 9 | ||||
| -rwxr-xr-x | prepare_release.sh | 14 |
5 files changed, 16 insertions, 11 deletions
diff --git a/internal/discovery/.gitignore b/internal/discovery/.gitignore index 2ff34c5..e245e8c 100644 --- a/internal/discovery/.gitignore +++ b/internal/discovery/.gitignore @@ -1,4 +1,2 @@ -/organization_list.json /organization_list.json.minisig -/server_list.json /server_list.json.minisig diff --git a/internal/discovery/organization_list.json b/internal/discovery/organization_list.json new file mode 100644 index 0000000..0967ef4 --- /dev/null +++ b/internal/discovery/organization_list.json @@ -0,0 +1 @@ +{} diff --git a/internal/discovery/server_list.json b/internal/discovery/server_list.json new file mode 100644 index 0000000..0967ef4 --- /dev/null +++ b/internal/discovery/server_list.json @@ -0,0 +1 @@ +{} diff --git a/make_release.sh b/make_release.sh index bbb633d..da9b6b5 100755 --- a/make_release.sh +++ b/make_release.sh @@ -68,15 +68,6 @@ git archive --prefix "${PROJECT_NAME}-${PROJECT_VERSION}/" "${BRANCH}" | tar -xf # so we have a self contained source archive. cd "${PROJECT_NAME}-${PROJECT_VERSION}" go mod vendor - -# Get discovery files and verify signature -echo "getting and verifying discovery files..." -wget -q https://disco.eduvpn.org/v2/organization_list.json -O internal/discovery/organization_list.json -wget -q https://disco.eduvpn.org/v2/organization_list.json.minisig -O internal/discovery/organization_list.json.minisig -minisign -Vm "internal/discovery/organization_list.json" -P RWRtBSX1alxyGX+Xn3LuZnWUT0w//B6EmTJvgaAxBMYzlQeI+jdrO6KF || minisign -Vm "internal/discovery/organization_list.json" -P RWQKqtqvd0R7rUDp0rWzbtYPA3towPWcLDCl7eY9pBMMI/ohCmrS0WiM -wget -q https://disco.eduvpn.org/v2/server_list.json -O internal/discovery/server_list.json -wget -q https://disco.eduvpn.org/v2/server_list.json.minisig -O internal/discovery/server_list.json.minisig -minisign -Vm "internal/discovery/server_list.json" -P RWRtBSX1alxyGX+Xn3LuZnWUT0w//B6EmTJvgaAxBMYzlQeI+jdrO6KF || minisign -Vm "internal/discovery/server_list.json" -P RWQKqtqvd0R7rUDp0rWzbtYPA3towPWcLDCl7eY9pBMMI/ohCmrS0WiM cd .. tar -cJf "${RELEASE_DIR}/${PROJECT_NAME}-${PROJECT_VERSION}.tar.xz" "${PROJECT_NAME}-${PROJECT_VERSION}" rm -rf "${PROJECT_NAME}-${PROJECT_VERSION}" diff --git a/prepare_release.sh b/prepare_release.sh index 89d621e..11db0bb 100755 --- a/prepare_release.sh +++ b/prepare_release.sh @@ -49,6 +49,20 @@ if [[ $(git diff) ]]; then git commit -m "Format: Run Ruff" fi +# Get discovery files and verify signature +echo "getting and verifying discovery files..." +wget -q https://disco.eduvpn.org/v2/organization_list.json -O internal/discovery/organization_list.json +wget -q https://disco.eduvpn.org/v2/organization_list.json.minisig -O internal/discovery/organization_list.json.minisig +minisign -Vm "internal/discovery/organization_list.json" -P RWRtBSX1alxyGX+Xn3LuZnWUT0w//B6EmTJvgaAxBMYzlQeI+jdrO6KF || minisign -Vm "internal/discovery/organization_list.json" -P RWQKqtqvd0R7rUDp0rWzbtYPA3towPWcLDCl7eY9pBMMI/ohCmrS0WiM +wget -q https://disco.eduvpn.org/v2/server_list.json -O internal/discovery/server_list.json +wget -q https://disco.eduvpn.org/v2/server_list.json.minisig -O internal/discovery/server_list.json.minisig +minisign -Vm "internal/discovery/server_list.json" -P RWRtBSX1alxyGX+Xn3LuZnWUT0w//B6EmTJvgaAxBMYzlQeI+jdrO6KF || minisign -Vm "internal/discovery/server_list.json" -P RWQKqtqvd0R7rUDp0rWzbtYPA3towPWcLDCl7eY9pBMMI/ohCmrS0WiM + +if [[ $(git diff) ]]; then + git add -u + git commit -m "Discovery: Update embedded files for new version" +fi + dch -v ${PROJECT_VERSION} --distribution unstable "New version" # Replace version number |