oxen-io
/
lokinet
mirror of https://github.com/oxen-io/lokinet
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

Fix build server name & path (#1516) 

builds.lokinet.dev -> oxen.rocks
/loki-project/ -> /oxen-io/
This commit is contained in:
Jason Rhinelander 2021-01-19 08:39:53 -04:00 committed by GitHub
parent 5f0f4e0c70
commit b3d2177e73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.drone.jsonnet
View File

@ -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. # Look for the debian branch in this repo first, try upstream if that fails.
if ! git checkout $${distro_branch}; then 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} git checkout $${distro_branch}
fi fi
|||, |||,

2
cmake/macos_installer_deps.cmake
View File

@ -3,7 +3,7 @@
# Here we build lokinet-network-control-panel into 'lokinet-gui.app' in "extra/" where a postinstall # Here we build lokinet-network-control-panel into 'lokinet-gui.app' in "extra/" where a postinstall
# script will then move it to /Applications/. # 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") CACHE STRING "Can be set to override the default lokinet-gui git repository")
set(LOKINET_GUI_CHECKOUT "origin/master" set(LOKINET_GUI_CHECKOUT "origin/master"
CACHE STRING "Can be set to specify a particular branch or tag to build from LOKINET_GUI_REPO") CACHE STRING "Can be set to specify a particular branch or tag to build from LOKINET_GUI_REPO")

2
cmake/win32_installer_deps.cmake
View File

@ -1,5 +1,5 @@
if(NOT GUI_ZIP_URL) 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) set(GUI_ZIP_HASH_OPTS EXPECTED_HASH SHA256=fcb1d78f7d6eecb440d05a034dd7e60ae506275af5b0f600b416bb1a896f32aa)
endif() endif()

4
contrib/ci/drone-debs-upload.sh
View File

@ -25,7 +25,7 @@ set -o xtrace # Don't start tracing until *after* we write the ssh key
chmod 600 ~/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 # 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 # -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" -mkdir $dir_tmp"
done done
sftp -i ~/ssh_key -b - -o StrictHostKeyChecking=off drone@builds.lokinet.dev <<SFTP sftp -i ~/ssh_key -b - -o StrictHostKeyChecking=off drone@oxen.rocks <<SFTP
$mkdirs $mkdirs
put ../*.*deb $upload_to put ../*.*deb $upload_to
SFTP SFTP

4
contrib/ci/drone-static-upload.sh
View File

@ -46,7 +46,7 @@ else
tar cJvf "$archive" "$base" tar cJvf "$archive" "$base"
fi fi
upload_to="builds.lokinet.dev/${DRONE_REPO// /_}/${DRONE_BRANCH// /_}" upload_to="oxen.rocks/${DRONE_REPO// /_}/${DRONE_BRANCH// /_}"
# sftp doesn't have any equivalent to mkdir -p, so we have to split the above up into a chain of # 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 # -mkdir a/, -mkdir a/b/, -mkdir a/b/c/, ... commands. The leading `-` allows the command to fail
@ -60,7 +60,7 @@ for p in "${upload_dirs[@]}"; do
-mkdir $dir_tmp" -mkdir $dir_tmp"
done done
sftp -i ssh_key -b - -o StrictHostKeyChecking=off drone@builds.lokinet.dev <<SFTP sftp -i ssh_key -b - -o StrictHostKeyChecking=off drone@oxen.rocks <<SFTP
$mkdirs $mkdirs
put $archive $upload_to put $archive $upload_to
SFTP SFTP