Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
d588501
upgrade to ember-cli 4
mnutt Dec 25, 2021
7b130bf
upgrade dependencies and use full git shas for git npm modules
mnutt Dec 25, 2021
bbe4dfc
updates for latest ember-file-upload
mnutt Dec 25, 2021
60525f4
remove old deprecations; silence a new one
mnutt Dec 25, 2021
807c146
wip upgrade dependencies
mnutt Feb 25, 2026
0cc8ba9
clean up dev build and startup
mnutt Feb 26, 2026
8643290
use powerbox->file-previewer instead of libreoffice for previews
mnutt Feb 28, 2026
c2fb68a
fix deprecated use of fs-promises and stop complaining about browsers…
mnutt Feb 28, 2026
6e6fe89
remove libreoffice and fix getPublicId helper build
mnutt Feb 28, 2026
e9b7b8d
upgradevm
mnutt Feb 28, 2026
4486f23
fix previewing, again
mnutt Mar 1, 2026
2c95df5
fix routing in sandstorm
mnutt Mar 1, 2026
d3e06b1
fix race conditions in adding, moving, deleting files
mnutt Mar 1, 2026
e745aff
upgrade from ember v4 to ember v6
mnutt Mar 2, 2026
c97e9ad
fix powerbox disconnect/reconnect behavior
mnutt Mar 2, 2026
ba14d5b
fix initial icon load size
mnutt Mar 2, 2026
e4a8c08
fix encoding issues with directories (fixes #144)
mnutt Mar 2, 2026
41a5027
warn when renaming a file to one that already exists
mnutt Mar 2, 2026
5df1f77
vendor yarn and update ci to node 24
mnutt Mar 2, 2026
9aec868
add spk build action
mnutt Mar 2, 2026
037f4d0
fewer separate js chunks
mnutt Mar 3, 2026
8f1cf5d
rebuild yarn.lock
mnutt Mar 3, 2026
1cc332a
switch off ember-cli-postcss
mnutt Mar 3, 2026
62c6c0c
bump davros version in prep for publishing 0.32.0
mnutt Mar 3, 2026
6ddcebb
minor dep version bumps
mnutt Mar 3, 2026
e2012f4
use a better powerbox request URI
mnutt Mar 3, 2026
5d589eb
minor dep version bumps
mnutt Mar 3, 2026
6ddfe6c
try fixing spk build
mnutt Mar 3, 2026
6e3f6e2
remove asset files from sandstorm-files.list because they are unstable
mnutt Mar 3, 2026
173a7bb
build helper
mnutt Mar 3, 2026
348f2ee
try building using lima-spk
mnutt Mar 3, 2026
d5f6a58
always run spk build
mnutt Mar 3, 2026
1515f1a
fix syntax error
mnutt Mar 3, 2026
2fd6ecb
more builds
mnutt Mar 3, 2026
206440b
silence warning
mnutt Mar 3, 2026
0e3a791
only build spk on prs/main builds again
mnutt Mar 3, 2026
7a617a2
build separate test and release spks
mnutt Mar 3, 2026
28adbc9
try publishing test spk to draft release
mnutt Mar 3, 2026
6b8be97
can't be draft release or files are inaccessible
mnutt Mar 3, 2026
eb0ae95
nicer markdown
mnutt Mar 3, 2026
07c99a5
add ok-to-test workflow
mnutt Mar 3, 2026
5ff9d8e
Merge branch 'master' into 2026-upgrades
mnutt Mar 3, 2026
3713fcb
actually extract json properly
mnutt Mar 3, 2026
9c06907
update permissions
mnutt Mar 3, 2026
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
23 changes: 0 additions & 23 deletions .eslintignore

This file was deleted.

59 changes: 0 additions & 59 deletions .eslintrc.js

This file was deleted.

87 changes: 23 additions & 64 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,43 +3,24 @@ name: CI
on: [push, pull_request]

env:
NODE_VERSION: '16'
NODE_VERSION: '24.13.0'

jobs:
lint:
name: Lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 1

- uses: actions/setup-node@v2-beta
steps:
- uses: actions/checkout@v4
- name: Install Node
uses: actions/setup-node@v4
with:
node-version: '${{ env.NODE_VERSION }}'

- name: Get Yarn cache path
id: global-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"

- name: Cache Yarn cache and node_modules
id: cache-dependencies
uses: actions/cache@v2
with:
path: |
${{ steps.global-cache-dir-path.outputs.dir }}
node_modules
key: ${{ runner.os }}-${{ matrix.node-version }}-${{
hashFiles('**/yarn.lock'
) }}
restore-keys: |
${{ runner.os }}-${{ matrix.node-version }}-

cache: yarn
- name: Enable Corepack
run: corepack enable
- name: Install Dependencies
run: yarn install --frozen-lockfile
if: |
steps.cache-dependencies.outputs.cache-hit != 'true'

run: yarn install --immutable
- name: Lint
run: yarn lint

Expand All @@ -50,30 +31,19 @@ jobs:

steps:
- name: Check out a copy of the repo
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Use Node.js ${{ env.NODE_VERSION }}
uses: actions/setup-node@v2-beta
uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE_VERSION }}
cache: yarn

- name: Get Yarn cache path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"

- name: Cache Yarn cache and node_modules
id: cache-dependencies
uses: actions/cache@v2
with:
path: |
${{ steps.yarn-cache-dir-path.outputs.dir }}
node_modules
key: ${{ runner.os }}-${{ env.NODE_VERSION }}-${{ hashFiles('**/yarn.lock') }}
restore-keys: ${{ runner.os }}-${{ env.NODE_VERSION }}-
- name: Enable Corepack
run: corepack enable

- name: Install dependencies
run: yarn install --frozen-lockfile
if: steps.cache-dependencies.outputs.cache-hit != 'true'
run: yarn install --immutable

- name: Test
run: yarn test:ember
Expand All @@ -85,34 +55,23 @@ jobs:

steps:
- name: Check out a copy of the repo
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Use Node.js ${{ env.NODE_VERSION }}
uses: actions/setup-node@v2-beta
uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE_VERSION }}
cache: yarn

- name: Get Yarn cache path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"

- name: Cache Yarn cache and node_modules
id: cache-dependencies
uses: actions/cache@v2
with:
path: |
${{ steps.yarn-cache-dir-path.outputs.dir }}
node_modules
key: ${{ runner.os }}-${{ env.NODE_VERSION }}-${{ hashFiles('**/yarn.lock') }}
restore-keys: ${{ runner.os }}-${{ env.NODE_VERSION }}-
- name: Enable Corepack
run: corepack enable

- name: Install dependencies
run: yarn install --frozen-lockfile
if: steps.cache-dependencies.outputs.cache-hit != 'true'
run: yarn install --immutable

- name: Cache litmus
id: cache-litmus
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/litmus
key: ${{ runner.os }}-litmus
Expand All @@ -139,4 +98,4 @@ jobs:

- name: Test server
if: always()
run: yarn test-server
run: yarn test:server
8 changes: 4 additions & 4 deletions .github/workflows/spk-build-reusable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,9 @@ jobs:
set -euo pipefail
mkdir -p build
if [ "${{ inputs.pack_mode }}" = "test" ]; then
pack_log="$(mktemp)"
lima-spk pack --dev --set-version "${GITHUB_SHA}" "${{ inputs.spk_output_path }}" 2>&1 | tee "$pack_log"
package_id="$(grep -Eo '[a-z0-9]{52,64}' "$pack_log" | tail -n1 || true)"
pack_json="$(lima-spk pack --dev --set-version "${GITHUB_SHA}" "${{ inputs.spk_output_path }}")"
printf '%s\n' "$pack_json"
package_id="$(printf '%s\n' "$pack_json" | jq -r '.packageId // empty')"
if [ -n "$package_id" ]; then
echo "package_id=$package_id" >> "$GITHUB_OUTPUT"
fi
Expand Down Expand Up @@ -258,7 +258,7 @@ jobs:
issue_number,
per_page: 100,
});
const existing = comments.find((comment) => comment.user.type === "Bot" && comment.body.includes(marker));
const existing = comments.find((comment) => comment.body.includes(marker));

if (existing) {
await github.rest.issues.updateComment({
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/spk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ on:

permissions:
contents: write
issues: write
pull-requests: write

jobs:
Expand Down
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ npm-debug.log*
yarn-error.log
testem.log
/.cache-require-paths.json
/.yarn
/.yarn/*
!/.yarn/releases/
!/.yarn/releases/*

# webdav data
/data/*
Expand All @@ -32,4 +34,7 @@ testem.log
# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
4 changes: 4 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,12 @@
/coverage/
!.*
.eslintcache
.lint-todo/

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
4 changes: 2 additions & 2 deletions .sandstorm/Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ unless Vagrant::DEFAULT_SERVER_URL.frozen?
end

Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
# Base on the Sandstorm snapshots of the official Debian 9 (stretch) box with vboxsf support.
config.vm.box = "debian/contrib-stretch64"
# Based on Debian 12
config.vm.box = "debian/contrib-bookworm64"
config.vm.post_up_message = "Your virtual server is running at http://local.sandstorm.io:6090."


Expand Down
36 changes: 32 additions & 4 deletions .sandstorm/build.sh
Original file line number Diff line number Diff line change
@@ -1,15 +1,43 @@
#!/bin/bash

set -euo pipefail

export HOME="${HOME:-/home/vagrant}"

cd /opt/app

# ensure data storage directory exists
sudo mkdir -p /var/davros
sudo chown $USER /var/davros
sudo chown "$USER" /var/davros
mkdir -p /var/davros/data

lock_hash_file="/opt/app/node_modules/.yarn-lock.sha256"
if command -v sha256sum >/dev/null 2>&1; then
current_lock_hash="$(sha256sum /opt/app/yarn.lock | awk '{print $1}')"
else
current_lock_hash="$(shasum -a 256 /opt/app/yarn.lock | awk '{print $1}')"
fi

need_install=0
if [ ! -d "/opt/app/node_modules" ]; then
yarn install
need_install=1
elif [ ! -f "$lock_hash_file" ]; then
need_install=1
elif [ "$(cat "$lock_hash_file")" != "$current_lock_hash" ]; then
need_install=1
fi

if [ "$need_install" -eq 1 ]; then
export CC=clang
export CXX=clang++
export npm_config_cxxflags="-std=gnu++20"
export CXXFLAGS="-std=gnu++20"
yarn install
mkdir -p /opt/app/node_modules
printf '%s\n' "$current_lock_hash" > "$lock_hash_file"
fi

if [ ! -d "/opt/app/dist" ]; then
./node_modules/.bin/ember build
./node_modules/.bin/ember build
fi

yarn build:server
22 changes: 6 additions & 16 deletions .sandstorm/compile_helper.sh
Original file line number Diff line number Diff line change
@@ -1,25 +1,15 @@
### Download & compile capnproto and the Sandstorm getPublicId helper.
### Install capnproto and build the Sandstorm getPublicId helper.

# First, get capnproto from master and install it to
# /usr/local/bin. This requires a C++ compiler. We opt for clang
# because that's what Sandstorm is typically compiled with.
if [ ! -e /usr/local/bin/capnp ] ; then
sudo DEBIAN_FRONTEND=noninteractive apt-get install -y -q clang autoconf pkg-config libtool
cd /tmp
if [ ! -e capnproto ]; then git clone https://github.com/capnproto/capnproto; fi
cd capnproto
git checkout master
cd c++
autoreconf -i
./configure
make -j2
sudo make install
# First, install capnp from apt along with headers/libs used by
# sandstorm-integration/Makefile.
if ! command -v capnp >/dev/null 2>&1 || ! pkg-config --exists capnp-rpc ; then
sudo DEBIAN_FRONTEND=noninteractive apt-get install -y -q clang-19 clang++-19 make pkg-config capnproto libcapnp-dev
fi

# Second, compile the small C++ program within
# /opt/app/sandstorm-integration.
if [ ! -e /opt/app/sandstorm-integration/getPublicId ] ; then
pushd /opt/app/sandstorm-integration
make
make CXX=clang++-19
fi
### All done.
1 change: 0 additions & 1 deletion .sandstorm/fake/etc-passwd

This file was deleted.

Loading