Commit Graph

13 Commits

Author SHA1 Message Date
fang
0ec3d5111d
Merge branch 'master' into naive/roller 2021-10-26 20:46:32 +02:00
fang
36cd69b6d0
Merge tag 'urbit-os-v2.100' into naive/roller 2021-10-26 17:08:03 +02:00
Fang
82ab1c04c2
dist: track deskjams properly 2021-09-27 13:57:16 +04:00
Fang
f9675040d1
dist: include desk jam files for livenet upgrade
These are required to ship alongside the rest of /pkg/arvo in the
"upgrade from master" case.
2021-09-27 00:31:20 +04:00
Logan Allen
52a5fe2445 gitattributes: treat package-lock.json files as binary 2021-06-15 10:51:05 -05:00
Philip Monk
f9e93fa660
naive: add snapshot via git lfs 2021-04-20 21:58:52 -07:00
Liam Fitzgerald
82a30a181c meta: do not treat arvo JS files as binary
We no longer keep minified JS in pkg/arvo, so we can treat the JS there
as a normal text file
2020-10-08 13:08:00 +10:00
Jared Tobin
eb27d67cca
gitattributes: export-ignore test directories [ci skip]
Don't include pkg/arvo/tests and pkg/urbit/tests when running
git-archive(1).

Additionally, move the export-ignore declaration for
pkg/urbit/hashtable_tests into the pkg/urbit/.gitattributes files.  For
default operation, git-archive(1) requires that these declarations be
located on the tree being archived.
2020-02-01 12:07:13 +04:00
Jared Tobin
769252f4e6
gitattributes: export-ignore hashtable_tests [ci skip]
Prevents pkg/urbit/hashtable_tests from being exported with
git-archive(1).
2020-02-01 11:22:47 +04:00
Jared Tobin
66f87062f3
apps: designate compiled js/css files as binary
The 'index.js', 'tile.js', and 'index.css' files included in several
Arvo apps are compiled, minified JS or CSS.  While they are technically
text, they are not usefully diffable.

This commit designates such files as 'binary' in .gitattributes, which
prevents git from attempting to create diffs for them in 'git log' and
'git show'.
2019-11-05 11:52:58 +08:00
benjamin-tlon
c86879e833
Nix Build + Monorepo Structure (#1196) 2019-03-04 16:43:53 -08:00
Raymond Pasco
bb5e995202 Look for pill in build dir, arvo in arvo/
also .gitignore them
BUG: length of arvo sources directory is hardcoded!
2016-02-15 06:06:56 -05:00
Steve Dee
f191689e34 Treat urbit.pill as binary
I guess if half your file's bytes are valid ASCII, it counts as
text? Luckily, git has a dotfile for this crap.
2014-04-08 17:29:33 -07:00