Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/S4mpsa/NIDAS
Browse files Browse the repository at this point in the history
  • Loading branch information
S4mpsa committed Nov 9, 2022
2 parents 652b4ee + c18e2e4 commit 7f33e56
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 9 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/delete-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ jobs:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- name: Checkout
uses: actions/checkout@v2
- name: Build
run: tar -cvf NIDAS.tar .shrc --exclude-from=tar-exclude.txt *
- name: Extract branch name
shell: bash
run: echo "##[set-output name=branch;]$(echo ${{ github.event.ref }})"
Expand Down
16 changes: 10 additions & 6 deletions .github/workflows/test-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@ name: CI-test
on:
# Triggers the workflow on push events for every branch
push:
branches:
- '*'
- '!master'
branches-ignore:
- master

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
Expand All @@ -25,8 +24,13 @@ jobs:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- name: Checkout
uses: actions/checkout@v2
- name: Build
- name: Build NIDAS
run: tar -cvf NIDAS.tar --exclude-from=tar-exclude.txt *
- name: Build modules
id: build_modules
run: mkdir -p modules && cd modules && find . -maxdepth 1 -mindepth 1 -type d -exec tar -cvf {}.tar --exclude-from=../tar-exclude.txt {} \; -exec sh -c 'echo "##[set-output name=modules_list;]"$(echo modules/$@ | sed -e "s/\.\///g" | sed -e "s/\ /\.tar /g" | sed -e "s/$/\.tar/")' _ {} + && cd ..
- name: Echo out
run: echo ${{ steps.build_modules.outputs }}
- name: Extract branch name
shell: bash
run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"; echo ${GITHUB_REF#refs/heads/}
Expand All @@ -37,6 +41,6 @@ jobs:
tag: 'auto-release-${{ steps.get_branch_name.outputs.branch }}'
prerelease: true
gzip: false
files: NIDAS.tar
files: NIDAS.tar ${{ steps.build_modules.outputs.modules_list }}
allow_override: true
body: This release was auto generated by a push on ${{ steps.get_branch_name.outputs.branch }}. Things here may not be production-ready. Use at you own risk.
body: This release was auto generated by a push on ${{ steps.get_branch_name.outputs.branch }}. Things here may not be production-ready. Use at your own risk.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ There are many things that can be configured.
* Each T3 Component bus gives the server 16 more components, with a maximum of around 50 free slots after the required hardware.
* Aim for the highest tier available.
* HardDisk
* NIDAS itself uses around 300Kb, so even a T1 Disk should work. We suggest using a T3 disk, however.
* NIDAS itself uses a bit over 300Kb, so it will fit on a T2 disk. We suggest using a T3 disk, however.
* Tier 3 graphics card and screen
* The configuration menu is very cramped and looks washed out with a T2 screen and GPU.

Expand Down

0 comments on commit 7f33e56

Please sign in to comment.