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
2 changes: 1 addition & 1 deletion .devcontainer/base/apt-requirements.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
"gnupg2": "2.4.8-4ubuntu3",
"locales": "2.43-2ubuntu2",
"udev": "259.5-0ubuntu3",
"wget": "1.25.0-2ubuntu4.2",
"wget": "1.25.0-2ubuntu4.3",
"xz-utils": "5.8.3-1"
}
15 changes: 4 additions & 11 deletions .github/workflows/build-push-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,23 +44,16 @@ jobs:
include:
- flavor: cpp
dockerfile: .devcontainer/cpp/Dockerfile
build-embedded-flavor: "false"
tool-inventory-file: .devcontainer/cpp/tool-inventory.json
- flavor: docs
dockerfile: .devcontainer/docs/Dockerfile
tool-inventory-file: .devcontainer/docs/tool-inventory.json
- flavor: embedded-cpp
dockerfile: .devcontainer/cpp/Dockerfile
build-embedded-flavor: "true"
tool-inventory-file: .devcontainer/embedded-cpp/tool-inventory.json
build-embedded-flavor: true
- flavor: rust
dockerfile: .devcontainer/rust/Dockerfile
build-embedded-flavor: "false"
tool-inventory-file: .devcontainer/rust/tool-inventory.json
- flavor: embedded-rust
dockerfile: .devcontainer/rust/Dockerfile
build-embedded-flavor: "true"
tool-inventory-file: .devcontainer/embedded-rust/tool-inventory.json
build-embedded-flavor: true
uses: ./.github/workflows/wc-build-push-test.yml
secrets:
TEST_GITHUB_TOKEN: ${{ secrets.TEST_GITHUB_TOKEN }}
Expand All @@ -74,11 +67,11 @@ jobs:
base-image: ${{ needs.build-push-test-base.outputs.fully-qualified-image-name }}@${{ needs.build-push-test-base.outputs.digest }}
build-args: |
BASE_IMAGE=${{ needs.build-push-test-base.outputs.fully-qualified-image-name }}@${{ needs.build-push-test-base.outputs.digest }}
${{ matrix.build-embedded-flavor != '' && format('BUILD_EMBEDDED_FLAVOR={0}', matrix.build-embedded-flavor) || '' }}
${{ matrix.build-embedded-flavor && 'BUILD_EMBEDDED_FLAVOR=true' || '' }}
devcontainer-metadata-file: .devcontainer/${{ matrix.flavor }}/devcontainer-metadata.json
dockerfile: ${{ matrix.dockerfile }}
enable-edge-tag: ${{ github.event_name == 'merge_group' }}
image-name: ${{ github.repository }}-${{ matrix.flavor }}
integration-test-file: test/${{ matrix.flavor }}/integration-tests.bats
integration-test-podman: true
tool-inventory-file: ${{ matrix.tool-inventory-file }}
tool-inventory-file: .devcontainer/${{ matrix.flavor }}/tool-inventory.json
7 changes: 1 addition & 6 deletions .github/workflows/wc-document-generation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ jobs:
generate-documents:
name: Generate Documents
runs-on: ubuntu-latest
container: ghcr.io/philips-software/amp-devcontainer-docs:v8.0.0@sha256:86151248390ef9061fc98f872a5cc18bffd90ac201b169c2ad208e484dd06415
permissions:
contents: read
steps:
Expand All @@ -24,12 +25,6 @@ jobs:
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
with:
persist-credentials: false
- name: Install dependencies
run: |
set -Eeuo pipefail

sudo apt-get update && sudo apt-get install --no-install-recommends -y plantuml
python -m pip install sbdl==1.22.7
- name: Build & Validate SBDL model
run: sbdl -m compile -r . > amp-devcontainer.sbdl
- name: Create document control context
Expand Down
Loading