pub-solar/os
5
0
Fork 2
Code Issues 4 Pull requests Packages Projects 1 Releases Wiki Activity

fix/upstreaming-merge-conflicts #41

Merged
teutat3s merged 19 commits from refs/pull/41/head into main 2021-10-11 22:11:36 +00:00
Conversation 0 Commits 19 Files changed 5 +89 -50

19 commits

Author SHA1 Message Date
teutat3s d57d7db32f
Merge branch 'devos' 2021-10-12 00:10:17 +02:00
bors[bot] 287cb82d1c
Merge #380 
380: chore: update deploy-rs, nvfetcher, devshell r=nrdxp a=GTrunSec

- waiting for https://github.com/divnix/digga/pull/108

Co-authored-by: GTrunSec <gtrunsec@hardenedlinux.org>
 2021-09-30 16:38:05 +00:00
GTrunSec 1df67a3f2a
update digga lock 2021-09-30 00:33:01 -07:00
GTrunSec f10a8fdd33
chore: update nvfecher 2021-09-29 11:49:43 -07:00
GTrunSec 950199ef2c
update deploy-rs overlay 2021-09-29 11:45:46 -07:00
bors[bot] 2976777ba9
Merge #378 
378: Update flake to use new modules options r=nrdxp a=Pacman99

connected to divnix/digga#107

Co-authored-by: Parthiv Seetharaman <pachum99@myrdd.info>
 2021-09-29 15:23:41 +00:00
Parthiv Seetharaman e0da74c87c Update flake to use new moddules options 2021-09-27 16:23:06 -07:00
Chris Montgomery e5660cdf83 ci: remove lingering references to main in workflow configs 
`main` is no longer in use.

See #369
 2021-09-20 08:10:55 -05:00
Chris Montgomery 95f89c0b44 docs: use single quotes in example to avoid shell expansion 2021-09-20 08:10:31 -05:00
Chris Montgomery ccf160dd21 docs: deploy command example is run from repo root 2021-09-20 08:10:31 -05:00
Chris Montgomery 0770c7f900 docs: bud get creates a directory named devos by default 
As mentioned in #370 it would not result in a directory called `bud`, as
can be seen in the custom `get.bash` command where the directory name
defaults to `devos`.
 2021-09-20 08:10:31 -05:00
Chris Montgomery 252769ce46 ci: update release workflow to checkout code from master branch 2021-09-20 08:10:31 -05:00
Chris Montgomery 57a14bb411 docs: update links to point to master instead of core 2021-09-20 08:10:31 -05:00
Chris Montgomery 19666a06a7 fix: bud get should init flake based off master 2021-09-20 08:10:31 -05:00
Chris Montgomery 955b9ce1c1 docs(bud): replace references to flk 2021-09-20 08:10:31 -05:00
Timothy DeHerrera f13c11ea17
README.md: fix broken links 2021-09-19 11:17:01 -06:00
Chris Montgomery c3461cd2c3 docs: master is the current target branch for pull requests 2021-09-19 07:32:52 -05:00
Chris Montgomery 54a9a8366e ci: workflows on main push should trigger on master push 2021-09-19 07:32:52 -05:00
Anton a3b2bcf3d5 fix typo in CONTRIBUTING.md 2021-09-18 09:20:09 -05:00