public/getpkg
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

'Generic Commit'
All checks were successful
Build-Test-Publish / build (linux/amd64) (push) Successful in 45s
Details
Build-Test-Publish / build (linux/arm64) (push) Successful in 1m0s
Details

Browse Source
This commit is contained in:
Your Name 2025-06-22 12:03:18 +12:00
parent c4001b0efc
commit 1fb8333e5f
2 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
getpkg/src/GetbinClient.cpp
View File

@ -66,7 +66,6 @@ bool GetbinClient::download(const std::string& toolName, const std::string& arch
// Configure SSL certificates for HTTPS // Configure SSL certificates for HTTPS
std::string ca_path = find_ca_certificates(); std::string ca_path = find_ca_certificates();
if (!ca_path.empty()) { if (!ca_path.empty()) {
std::cerr << "[GetbinClient] Found CA certificates at: " << ca_path << std::endl;
// Use addSSLConfigs with proper parameter names for OpenSSL // Use addSSLConfigs with proper parameter names for OpenSSL
std::vector<std::pair<std::string, std::string>> sslConfigs; std::vector<std::pair<std::string, std::string>> sslConfigs;
sslConfigs.push_back({"VerifyCAFile", ca_path}); sslConfigs.push_back({"VerifyCAFile", ca_path});
@ -147,7 +146,6 @@ bool GetbinClient::upload(const std::string& archivePath, std::string& outUrl, s
// Configure SSL certificates // Configure SSL certificates
std::string ca_path = find_ca_certificates(); std::string ca_path = find_ca_certificates();
if (!ca_path.empty()) { if (!ca_path.empty()) {
std::cerr << "[GetbinClient] Found CA certificates at: " << ca_path << std::endl;
std::vector<std::pair<std::string, std::string>> sslConfigs; std::vector<std::pair<std::string, std::string>> sslConfigs;
sslConfigs.push_back({"VerifyCAFile", ca_path}); sslConfigs.push_back({"VerifyCAFile", ca_path});
client->addSSLConfigs(sslConfigs); client->addSSLConfigs(sslConfigs);
@ -245,7 +243,6 @@ bool GetbinClient::getHash(const std::string& toolName, const std::string& arch,
// Configure SSL certificates // Configure SSL certificates
std::string ca_path = find_ca_certificates(); std::string ca_path = find_ca_certificates();
if (!ca_path.empty()) { if (!ca_path.empty()) {
std::cerr << "[GetbinClient] Found CA certificates at: " << ca_path << std::endl;
std::vector<std::pair<std::string, std::string>> sslConfigs; std::vector<std::pair<std::string, std::string>> sslConfigs;
sslConfigs.push_back({"VerifyCAFile", ca_path}); sslConfigs.push_back({"VerifyCAFile", ca_path});
client->addSSLConfigs(sslConfigs); client->addSSLConfigs(sslConfigs);
@ -320,7 +317,6 @@ bool GetbinClient::deleteObject(const std::string& hash, const std::string& toke
// Configure SSL certificates // Configure SSL certificates
std::string ca_path = find_ca_certificates(); std::string ca_path = find_ca_certificates();
if (!ca_path.empty()) { if (!ca_path.empty()) {
std::cerr << "[GetbinClient] Found CA certificates at: " << ca_path << std::endl;
std::vector<std::pair<std::string, std::string>> sslConfigs; std::vector<std::pair<std::string, std::string>> sslConfigs;
sslConfigs.push_back({"VerifyCAFile", ca_path}); sslConfigs.push_back({"VerifyCAFile", ca_path});
client->addSSLConfigs(sslConfigs); client->addSSLConfigs(sslConfigs);
@ -384,9 +380,6 @@ bool GetbinClient::listPackages(std::vector<std::string>& outPackages) {
// Set up SSL configuration // Set up SSL configuration
std::string ca_path = find_ca_certificates(); std::string ca_path = find_ca_certificates();
if (!ca_path.empty()) {
std::cout << "[GetbinClient] Found CA certificates at: " << ca_path << std::endl;
}
bool success = false; bool success = false;
bool done = false; bool done = false;

16
getpkg/test.sh
View File

@ -62,15 +62,13 @@ cleanup() {
if [ -n "${SOS_WRITE_TOKEN:-}" ]; then if [ -n "${SOS_WRITE_TOKEN:-}" ]; then
echo "Attempting to clean up test objects from getpkg.xyz..." echo "Attempting to clean up test objects from getpkg.xyz..."
# Get the hash of our test tool if it exists # Clean up main architecture variant
HASH=$(curl -s "https://getpkg.xyz/hash/${TEST_TOOL_NAME}:${TEST_ARCH}" 2>/dev/null || echo "") $GETPKG unpublish "${TEST_TOOL_NAME}:${TEST_ARCH}" 2>/dev/null || true
if [ -n "$HASH" ] && [ "$HASH" != "null" ] && [ "$HASH" != "Not found" ]; then
echo "Found test tool hash: $HASH" # Clean up noarch variant
# Delete the object $GETPKG unpublish "${TEST_TOOL_NAME}-noarch:universal" 2>/dev/null || true
curl -s -H "Authorization: Bearer ${SOS_WRITE_TOKEN}" \
"https://getpkg.xyz/deleteobject?hash=${HASH}" >/dev/null 2>&1 || true echo "Cleaned up test tools from getpkg.xyz"
echo "Cleaned up test tool from getpkg.xyz"
fi
else else
echo "Note: SOS_WRITE_TOKEN not set, cannot clean up remote test objects" echo "Note: SOS_WRITE_TOKEN not set, cannot clean up remote test objects"
fi fi