Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

[nasa/nos3#231] AMD64 and ARM64 container support #320

Merged
merged 4 commits into from
Jun 19, 2024
Merged

[nasa/nos3#231] AMD64 and ARM64 container support #320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6a04655
[nasa/nos3#231] Change over to use new version of nos3-64:dev that su…
jlucas9 Jun 12, 2024
f34d439
[nasa/nos3#231] Use new nos3-64:20240618 container and added notes to…
jlucas9 Jun 18, 2024
1d68ec7
Merge remote-tracking branch 'origin/dev' into nos3#231
jlucas9 Jun 18, 2024
9497f4c
[nasa/nos3#231] Update CI to use new nos3-64:20240618 container;
jlucas9 Jun 18, 2024
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
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
fsw:
runs-on: ubuntu-latest
container:
image: ivvitc/nos3-64:dev
image: ivvitc/nos3-64:20240618
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -29,7 +29,7 @@ jobs:
sim:
runs-on: ubuntu-latest
container:
image: ivvitc/nos3-64:dev
image: ivvitc/nos3-64:20240618
steps:
- uses: actions/checkout@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion scripts/env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ OPENC3_PATH=$OPENC3_DIR/openc3.sh
DNETWORK="docker network"
#fi

DBOX="ivvitc/nos3-64:20240430"
DBOX="ivvitc/nos3-64:20240618"

# Debugging
#echo "Script directory = " $SCRIPT_DIR
Expand Down
19 changes: 18 additions & 1 deletion scripts/prepare.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,26 @@ $DFLAGS_CPUS -v $BASE_DIR:$BASE_DIR -v $USER_NOS3_DIR:$USER_NOS3_DIR -w $USER_NO
echo ""
echo ""

echo "Prepare Igniter..."
echo "NOS3 required preparations complete!"
echo "Proceeding to optional additions."
echo ""
echo ""

echo "Prepare Igniter (optional)..."
pip3 install pyside6 xmltodict
cd $BASE_DIR
python3 $BASE_DIR/cfg/gui/cfg_gui_main.py &
echo ""
echo ""

sleep 3
echo ""
echo ""

echo "NOS3 prep script complete:"
echo " Some above optional installations may have failed, that's ok. You just may not have those extra features."
echo " You can choose to use the Igniter GUI or close it in favor of the command line."
echo " To launch igniter again simply run the following in the terminal:"
echo " make igniter"
echo ""
echo ""
Loading