diff --git a/.drone.jsonnet b/.drone.jsonnet index 3890ab513..88dceca25 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -134,7 +134,7 @@ local deb_builder(image, distro, distro_branch, arch='amd64', loki_repo=true) = ||| # Look for the debian branch in this repo first, try upstream if that fails. if ! git checkout $${distro_branch}; then - git remote add --fetch upstream https://github.com/loki-project/loki-network.git && + git remote add --fetch upstream https://github.com/oxen-io/loki-network.git && git checkout $${distro_branch} fi |||, diff --git a/cmake/macos_installer_deps.cmake b/cmake/macos_installer_deps.cmake index 322cb213c..2333c7d41 100644 --- a/cmake/macos_installer_deps.cmake +++ b/cmake/macos_installer_deps.cmake @@ -3,7 +3,7 @@ # Here we build lokinet-network-control-panel into 'lokinet-gui.app' in "extra/" where a postinstall # script will then move it to /Applications/. -set(LOKINET_GUI_REPO "https://github.com/loki-project/loki-network-control-panel.git" +set(LOKINET_GUI_REPO "https://github.com/oxen-io/loki-network-control-panel.git" CACHE STRING "Can be set to override the default lokinet-gui git repository") set(LOKINET_GUI_CHECKOUT "origin/master" CACHE STRING "Can be set to specify a particular branch or tag to build from LOKINET_GUI_REPO") diff --git a/cmake/win32_installer_deps.cmake b/cmake/win32_installer_deps.cmake index 849da7aee..348572a45 100644 --- a/cmake/win32_installer_deps.cmake +++ b/cmake/win32_installer_deps.cmake @@ -1,5 +1,5 @@ if(NOT GUI_ZIP_URL) - set(GUI_ZIP_URL "https://oxen.rocks/loki-project/loki-network-control-panel/master/lokinet-gui-windows-32bit-v0.3.5.zip") + set(GUI_ZIP_URL "https://oxen.rocks/oxen-io/loki-network-control-panel/master/lokinet-gui-windows-32bit-v0.3.5.zip") set(GUI_ZIP_HASH_OPTS EXPECTED_HASH SHA256=fcb1d78f7d6eecb440d05a034dd7e60ae506275af5b0f600b416bb1a896f32aa) endif() diff --git a/contrib/ci/drone-debs-upload.sh b/contrib/ci/drone-debs-upload.sh index 57495e808..b868972e1 100755 --- a/contrib/ci/drone-debs-upload.sh +++ b/contrib/ci/drone-debs-upload.sh @@ -25,7 +25,7 @@ set -o xtrace # Don't start tracing until *after* we write the ssh key chmod 600 ~/ssh_key -upload_to="builds.lokinet.dev/debs/${DRONE_REPO// /_}@${DRONE_BRANCH// /_}/$(date --date=@$DRONE_BUILD_CREATED +%Y%m%dT%H%M%SZ)-${DRONE_COMMIT:0:9}/$distro/$DRONE_STAGE_ARCH" +upload_to="oxen.rocks/debs/${DRONE_REPO// /_}@${DRONE_BRANCH// /_}/$(date --date=@$DRONE_BUILD_CREATED +%Y%m%dT%H%M%SZ)-${DRONE_COMMIT:0:9}/$distro/$DRONE_STAGE_ARCH" # sftp doesn't have any equivalent to mkdir -p, so we have to split the above up into a chain of # -mkdir a/, -mkdir a/b/, -mkdir a/b/c/, ... commands. The leading `-` allows the command to fail @@ -39,7 +39,7 @@ for p in "${upload_dirs[@]}"; do -mkdir $dir_tmp" done -sftp -i ~/ssh_key -b - -o StrictHostKeyChecking=off drone@builds.lokinet.dev <