Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dev andy vb12 #2065

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Dev andy vb12 #2065

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2f549d2
[demo] pp line -> test_
Aug 28, 2024
65597be
soil setup
Aug 28, 2024
fdc475e
re-order
Aug 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions demo/url-search-params.ysh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,11 +141,11 @@ proc test-part() {
for s in (PART_CASES) {
js-decode-part $s | json read (&js)
echo 'JS'
pp line (js)
pp test_ (js)

echo 'YSH'
var y = unquote(s)
pp line (y)
pp test_ (y)

assert [y === js]

Expand Down
45 changes: 28 additions & 17 deletions soil/common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,23 +20,34 @@ dump-env() {
env | grep -v '^encrypted_' | sort
}

if true; then
readonly SOIL_USER='travis_admin'
readonly SOIL_HOST='ci.oilshell.org'
readonly SOIL_HOST_DIR=~/ci.oilshell.org # used on server
readonly SOIL_REMOTE_DIR=ci.oilshell.org # used on client
elif false; then
readonly SOIL_USER='oils'
readonly SOIL_HOST='mb.oils.pub'
# Extra level
readonly SOIL_HOST_DIR=~/www/mb.oils.pub # used on server
readonly SOIL_REMOTE_DIR=www/mb.oils.pub # used on client
else
readonly SOIL_USER='oils'
readonly SOIL_HOST='op.oils.pub'
readonly SOIL_HOST_DIR=~/op.oils.pub # used on server
readonly SOIL_REMOTE_DIR=op.oils.pub # used on client
fi
# dh, mb, op
_soil_service=mb

case $_soil_service in
dh)
readonly SOIL_USER='travis_admin'
readonly SOIL_HOST='ci.oilshell.org'
readonly SOIL_HOST_DIR=~/ci.oilshell.org # used on server
readonly SOIL_REMOTE_DIR=ci.oilshell.org # used on client
;;
mb)
readonly SOIL_USER='oils'
readonly SOIL_HOST='mb.oils.pub'
# Extra level
readonly SOIL_HOST_DIR=~/www/mb.oils.pub # used on server
readonly SOIL_REMOTE_DIR=www/mb.oils.pub # used on client
;;
op)
readonly SOIL_USER='oils'
readonly SOIL_HOST='op.oils.pub'
readonly SOIL_HOST_DIR=~/op.oils.pub # used on server
readonly SOIL_REMOTE_DIR=op.oils.pub # used on client
;;
*)
echo "Invalid Soil service $_soil_service" >& 2
exit 1
;;
esac

readonly SOIL_USER_HOST="$SOIL_USER@$SOIL_HOST"

Expand Down
13 changes: 7 additions & 6 deletions soil/web-init.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,27 +53,28 @@ home-page() {

<tr>
<td>
<a href="uuu/sourcehut-jobs/">sr.ht</a>
<a href="uuu/github-jobs/">Github Actions</a>
</td>
<td>
<a href="https://builds.sr.ht/~andyc">builds.sr.ht</a>
<a href="https://github.com/oilshell/oil/actions/workflows/all-builds.yml">github.com</a>
</td>
<td>
<a href="https://github.com/oils-for-unix/oils/tree/master/.builds">.builds</a>
<a href="https://github.com/oils-for-unix/oils/tree/master/.github/workflows">.github/workflows</a>
</td>
</tr>

<tr>
<td>
<a href="uuu/github-jobs/">Github Actions</a>
<a href="uuu/sourcehut-jobs/">sr.ht</a>
</td>
<td>
<a href="https://github.com/oilshell/oil/actions/workflows/all-builds.yml">github.com</a>
<a href="https://builds.sr.ht/~andyc">builds.sr.ht</a>
</td>
<td>
<a href="https://github.com/oils-for-unix/oils/tree/master/.github/workflows">.github/workflows</a>
<a href="https://github.com/oils-for-unix/oils/tree/master/.builds">.builds</a>
</td>
</tr>

EOF

if false; then
Expand Down