Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 2 additions & 24 deletions .github/workflows/anms-core.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,30 +7,8 @@ on:
- anms-core/**

jobs:
unit-test:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
submodules: recursive
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: "3.10"
- name: Install dependencies
run: |
pip3 install deps/dtnma-ace
pip3 install deps/dtnma-camp
- name: Install
working-directory: anms-core
run: pip3 install -e '.[test]'
- name: Run test
working-directory: anms-core
run: PYTHONPATH=src python3 -m pytest --junit-xml=testresults.xml --cov=anms test

flake8:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Checkout repository
uses: actions/checkout@v4
Expand All @@ -39,7 +17,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: "3.10"
python-version: "3.9"
- name: Install dependencies
run: |
pip3 install deps/dtnma-ace
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/aricodec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: "3.10"
python-version: "3.9"
- name: Install dependencies
run: |
pip3 install deps/dtnma-ace
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/build-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,8 @@ jobs:
sudo mkdir /run/anms
- name: Start
run: |
podman compose ${ANMS_COMPOSE_OPTS} up -d --force-recreate
podman compose ${TESTENV_COMPOSE_OPTS} up -d --force-recreate
sleep 5
podman compose ${TESTENV_COMPOSE_OPTS} up -d --force-recreate --wait
podman compose ${ANMS_COMPOSE_OPTS} up -d --force-recreate --wait
- name: Status
run: |
for BADSTATUS in stopped restarting; do
Expand Down Expand Up @@ -99,7 +98,9 @@ jobs:
echo "GITHUB_WORKSPACE=${{ github.workspace }}"
ls -al ${{ github.workspace }}
- name: Build Main
run: docker compose ${ANMS_COMPOSE_OPTS} build
run: |
docker compose ${ANMS_COMPOSE_OPTS} build builder-base builder-init builder-acelib
docker compose ${ANMS_COMPOSE_OPTS} build
- name: Build Agents
run: docker compose ${TESTENV_COMPOSE_OPTS} build
- name: Build Volume
Expand All @@ -108,9 +109,8 @@ jobs:
sudo mkdir /run/anms
- name: Start
run: |
docker compose ${ANMS_COMPOSE_OPTS} up -d --force-recreate
docker compose ${TESTENV_COMPOSE_OPTS} up -d --force-recreate
sleep 5
docker compose ${TESTENV_COMPOSE_OPTS} up -d --force-recreate --wait
docker compose ${ANMS_COMPOSE_OPTS} up -d --force-recreate --wait
- name: Status
run: |
for BADSTATUS in stopped restarting; do
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/transcoder.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

jobs:
flake8:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Checkout repository
uses: actions/checkout@v4
Expand All @@ -17,7 +17,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: "3.10"
python-version: "3.9"
- name: Install flake8
working-directory: transcoder
run: pip3 install flake8
Expand Down
2 changes: 1 addition & 1 deletion anms-core/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,5 @@ COPY --chmod=755 docker-entrypoint.sh /usr/local/bin/
USER ${APP_USER}
CMD ["/usr/local/bin/docker-entrypoint.sh"]

HEALTHCHECK --interval=60s --timeout=60s --retries=20 \
HEALTHCHECK --start-period=10s --interval=60s --timeout=10s --retries=20 \
CMD ["curl", "-sq", "-o/dev/null", "http://localhost:5555/hello"]
4 changes: 2 additions & 2 deletions anms-ui/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ ENV PM2_HOME=${APP_WORK_DIR}/.pm2

# Install NodeJS Global Dependencies
RUN --mount=type=cache,target=/root/.cache/yarn \
yarn global add pm2 @vue/cli
yarn global --ignore-engines add pm2 @vue/cli

# Remaining commands as this user
USER ${APP_USER}:${APP_USER}
Expand Down Expand Up @@ -79,7 +79,7 @@ COPY --chown=${APP_USER}:${APP_USER} config.yaml process.yml config_ui_env.js da

CMD ["pm2-docker", "process.yml", "--env", "production"]

HEALTHCHECK --start-period=10s --interval=60s --timeout=60s --retries=20 \
HEALTHCHECK --start-period=10s --interval=60s --timeout=10s --retries=20 \
CMD ["pm2", "pid", "anms"]

EXPOSE 9030
8 changes: 5 additions & 3 deletions anms-ui/prep_packages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,14 @@ mkdir -p "/home/${USER}/.cache/yarn"

for SUBNAME in server public
do
echo -e "\n\nUpdating in ${SUBNAME}...\n"
docker run \
-v "/etc/group:/etc/group:ro" \
-v "/etc/passwd:/etc/passwd:ro" \
-v "/etc/shadow:/etc/shadow:ro" \
-u ${UID}:${GID} \
-v "/home/${USER}/.cache/yarn:/home/${USER}/.cache/yarn" \
-v "${SELFDIR}/${SUBNAME}:/usr/src/app" \
yarn-base bash -c "cd /usr/src/app && yarn install"
-v "/home/${USER}/.cache/yarn:/home/${USER}/.cache/yarn:U" \
-v "${SELFDIR}/${SUBNAME}:/usr/src/app:U" \
yarn-base \
bash -c "cd /usr/src/app && yarn install"
done
1 change: 0 additions & 1 deletion anms-ui/public/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"name": "anms-ui",
"version": "0.1.1",
"dependencies": {
"@achrinza/node-ipc": "^10.1.11",
"@fortawesome/fontawesome-free": "^5.13.0",
"@fortawesome/fontawesome-svg-core": "^1.2.32",
"@fortawesome/free-solid-svg-icons": "^6.2.0",
Expand Down
Loading