Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-26 02:11:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

switch back to github caching (#2371)

Browse Source 
* switch back to github caching

* remove npm and cargo cache

* misc fixes
This commit is contained in:
Aiden McClelland
2023-07-25 10:06:57 -06:00
committed by GitHub
parent 234f0d75e8
commit 8f44c75dc3
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
.github/workflows/startos-iso.yaml vendored
View File

@@ -75,6 +75,9 @@ jobs:
)[github.event.inputs.runner == 'fast'] )[github.event.inputs.runner == 'fast']
}} }}
steps: steps:
- name: Free space
run: df -h && rm -rf /opt/hostedtoolcache* && df -h
- run: | - run: |
sudo mount -t tmpfs tmpfs . sudo mount -t tmpfs tmpfs .
if: ${{ github.event.inputs.runner == 'fast' && (matrix.platform == 'x86_64' || matrix.platform == 'x86_64-nonfree' || github.event.inputs.platform == matrix.platform) }} if: ${{ github.event.inputs.runner == 'fast' && (matrix.platform == 'x86_64' || matrix.platform == 'x86_64-nonfree' || github.event.inputs.platform == matrix.platform) }}
@@ -103,7 +106,7 @@ jobs:
id: npm-cache-dir id: npm-cache-dir
run: | run: |
echo "dir=$(npm config get cache)" >> $GITHUB_OUTPUT echo "dir=$(npm config get cache)" >> $GITHUB_OUTPUT
- uses: buildjet/cache@v3 - uses: actions/cache@v3
id: npm-cache id: npm-cache
with: with:
path: ${{ steps.npm-cache-dir.outputs.dir }} path: ${{ steps.npm-cache-dir.outputs.dir }}
@@ -153,7 +156,7 @@ jobs:
- run: sudo mount -t tmpfs tmpfs /var/tmp/debspawn - run: sudo mount -t tmpfs tmpfs /var/tmp/debspawn
if: ${{ github.event.inputs.runner == 'fast' && (matrix.platform == 'x86_64' || matrix.platform == 'x86_64-nonfree') }} if: ${{ github.event.inputs.runner == 'fast' && (matrix.platform == 'x86_64' || matrix.platform == 'x86_64-nonfree') }}
- uses: buildjet/cache@v3 - uses: actions/cache@v3
with: with:
path: /var/lib/debspawn path: /var/lib/debspawn
key: ${{ runner.os }}-${{ matrix.platform }}-debspawn-init key: ${{ runner.os }}-${{ matrix.platform }}-debspawn-init
@@ -162,7 +165,7 @@ jobs:
- run: "mv embassy-os-deb/embassyos_0.3.x-1_*.deb startos-image-recipes/overlays/deb/" - run: "mv embassy-os-deb/embassyos_0.3.x-1_*.deb startos-image-recipes/overlays/deb/"
- run: "rm -rf embassy-os-deb" - run: "rm -rf embassy-os-deb ${{ steps.npm-cache-dir.outputs.dir }} $HOME/.cargo"
- name: Run iso build - name: Run iso build
working-directory: startos-image-recipes working-directory: startos-image-recipes

1
backend/src/db/model.rs
View File

@@ -107,6 +107,7 @@ pub struct ServerInfo {
pub lan_address: Url, pub lan_address: Url,
pub tor_address: Url, pub tor_address: Url,
#[model] #[model]
#[serde(default)]
pub ip_info: BTreeMap<String, IpInfo>, pub ip_info: BTreeMap<String, IpInfo>,
#[model] #[model]
#[serde(default)] #[serde(default)]

2
build/lib/motd
View File

@@ -10,7 +10,7 @@ cat << "ASCII"
╰ ━ ━ ━ ╯ ╰ ━ ┻ ╯ ╰ ┻ ╯ ╰ ━ ┻ ━ ━ ━ ┻ ━ ━ ━ ╯ ╰ ━ ━ ━ ╯ ╰ ━ ┻ ╯ ╰ ┻ ╯ ╰ ━ ┻ ━ ━ ━ ┻ ━ ━ ━ ╯
ASCII ASCII
printf " %s (%s %s)\n" "$(uname -o)" "$(uname -r)" "$(uname -m)" printf " %s (%s %s)\n" "$(uname -o)" "$(uname -r)" "$(uname -m)"
printf " $(embassy-cli --version | sed 's/StartOS CLI /StartOS v/g') - $(embassy-cli git-info)" printf " $(start-cli --version | sed 's/StartOS CLI /StartOS v/g') - $(start-cli git-info)"
if [ -n "$(cat /usr/lib/embassy/ENVIRONMENT.txt)" ]; then if [ -n "$(cat /usr/lib/embassy/ENVIRONMENT.txt)" ]; then
printf " ~ $(cat /usr/lib/embassy/ENVIRONMENT.txt)\n" printf " ~ $(cat /usr/lib/embassy/ENVIRONMENT.txt)\n"
else else