Skip to content

Commit

Permalink
Merge branch 'main' into fix-prod-template-and-js
Browse files Browse the repository at this point in the history
  • Loading branch information
underdarknl authored Oct 16, 2024
2 parents 4deb6b5 + 0f31898 commit 11ccf5c
Show file tree
Hide file tree
Showing 44 changed files with 1,168 additions and 1,036 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/boefjes_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,12 @@ on:
paths:
- boefjes/**
- octopoes/**
- .github/workflows/boefjes_test.yml
pull_request:
paths:
- boefjes/**
- octopoes/**
- .github/workflows/boefjes_test.yml

jobs:
Tests:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/build_docs_on_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
paths:
- "docs/**"
- "requirements.txt"
- ".github/workflows/build_docs_on_pr.yml"

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/bytes_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@ on:
- "*"
paths:
- bytes/**
- .github/workflows/bytes_test.yml
pull_request:
paths:
- bytes/**
- .github/workflows/bytes_test.yml

jobs:
test:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/check_poetry_dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,14 @@ on:
- "**/requirements-dev.txt"
- "**/pyproject.toml"
- "**/poetry.lock"
- ".github/workflows/check_poetry_dependencies.yml"
pull_request:
paths:
- "**/requirements.txt"
- "**/requirements-dev.txt"
- "**/pyproject.toml"
- "**/poetry.lock"
- ".github/workflows/check_poetry_dependencies.yml"

jobs:
poetry-dependencies:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/keiko_itest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@ on:
- "*"
paths:
- keiko/**
- .github/workflows/keiko_itest.yml
pull_request:
paths:
- keiko/**
- .github/workflows/keiko_itest.yml

jobs:
itest:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/keiko_tex_linters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@ on:
- "*"
paths:
- keiko/**
- .github/workflows/keiko_tex_linters.yml
pull_request:
paths:
- keiko/**
- .github/workflows/keiko_tex_linters.yml

jobs:
check-latex:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/mula_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@ on:
- "*"
paths:
- mula/**
- .github/workflows/mula_test.yml
pull_request:
paths:
- mula/**
- .github/workflows/mula_test.yml

jobs:
test:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/octopoes_rtest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@ on:
- "*"
paths:
- octopoes/**
- .github/workflows/octopoes_rtest.yml
pull_request:
paths:
- octopoes/**
- .github/workflows/octopoes_rtest.yml

jobs:
rtest:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/octopoes_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@ on:
- "*"
paths:
- octopoes/**
- .github/workflows/octopoes_test.yml
pull_request:
paths:
- octopoes/**
- .github/workflows/octopoes_test.yml

jobs:
test:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/rocky_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,12 @@ on:
paths:
- octopoes/**
- rocky/**
- .github/workflows/rocky_test.yml
pull_request:
paths:
- octopoes/**
- rocky/**
- .github/workflows/rocky_test.yml

jobs:
test:
Expand Down
10 changes: 8 additions & 2 deletions boefjes/boefjes/job_handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,14 @@ def handle(self, boefje_meta: BoefjeMeta) -> None:
ooi = get_octopoes_api_connector(boefje_meta.organization).get(
reference, valid_time=datetime.now(timezone.utc)
)
except ObjectNotFoundException as e:
raise ObjectNotFoundException(f"Object {reference} not found in Octopoes") from e
except ObjectNotFoundException:
logger.info(
"Can't run boefje because OOI does not exist anymore",
boefje_id=boefje_meta.boefje.id,
ooi=reference,
task_id=boefje_meta.id,
)
return

boefje_meta.arguments["input"] = ooi.serialize()

Expand Down
3 changes: 3 additions & 0 deletions boefjes/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,6 @@ override_dh_installsystemd:
dh_installsystemd --name=kat-normalizers
dh_installsystemd --name=kat-katalogus
sed -i s/python3.9/`py3versions -d`/ debian/kat-boefjes/lib/systemd/system/*.service

# Disables dh_strip_nondeterminism because it very slow and not useful for us
override_dh_strip_nondeterminism:
Loading

0 comments on commit 11ccf5c

Please sign in to comment.