From e2c68b8495ade5c7d6ad4385f6a31c8242f25061 Mon Sep 17 00:00:00 2001 From: Thomas Willson Date: Fri, 9 Feb 2024 09:22:50 -0800 Subject: [PATCH] Add python-venv and remove python packages. +semver:minor (#27) We are going to be managing python dependencies fully within our C++ projects from here on out. Removing old dependencies and installing python-venv. Update the structurizr URL, the other release had been removed. --- .github/workflows/build-package.yml | 2 ++ stafl-devcontainer/Dockerfile | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-package.yml b/.github/workflows/build-package.yml index f5774dd..136c8c0 100644 --- a/.github/workflows/build-package.yml +++ b/.github/workflows/build-package.yml @@ -15,6 +15,8 @@ jobs: steps: - name: Check out the repo uses: actions/checkout@v4 + with: + fetch-depth: 0 - name: Login to GitHub Container Registry uses: docker/login-action@v3 diff --git a/stafl-devcontainer/Dockerfile b/stafl-devcontainer/Dockerfile index 4978233..3d6a4d3 100644 --- a/stafl-devcontainer/Dockerfile +++ b/stafl-devcontainer/Dockerfile @@ -11,9 +11,9 @@ ADD user-setup-scripts /user-setup-scripts RUN export DEBIAN_FRONTEND=noninteractive \ && apt-get update \ - && apt-get -y install --no-install-recommends curl clang llvm-14 clang-format-14 doxygen g++ lcov gdb ninja-build wget bzip2 python2.7-dev python3 python3-pip python3-dev gcc-multilib-mips-linux-gnu gcc-mips-linux-gnu g++-mips-linux-gnu qemu-user libncurses5 graphviz plantuml make software-properties-common udev ksh ripgrep bash-completion ca-certificates curl gnupg dos2unix\ + && apt-get -y install --no-install-recommends curl clang llvm-14 clang-format-14 doxygen g++ lcov gdb ninja-build wget bzip2 python2.7-dev python3 python3-pip python3-dev python3.10-venv gcc-multilib-mips-linux-gnu gcc-mips-linux-gnu g++-mips-linux-gnu qemu-user libncurses5 graphviz plantuml make software-properties-common udev ksh ripgrep bash-completion ca-certificates curl gnupg dos2unix\ && find -path '/user-setup-scripts/*' | xargs dos2unix \ - && pip install cmake breathe sphinx sphinx_rtd_theme sphinxcontrib-plantuml sphinxcontrib-kroki \ + && pip install cmake \ && ln -s /usr/bin/llvm-cov-14 /usr/bin/llvm-cov \ && ln -s /usr/bin/llvm-profdata-14 /usr/bin/llvm-profdata \ && add-apt-repository -y -n ppa:mozillateam/ppa \ @@ -75,7 +75,7 @@ RUN case ${TARGETPLATFORM} in \ && sudo apt install -y ./jlink_install.deb \ && rm ./jlink_install.deb -ARG STRUCTURIZR_CLI_URL="https://github.com/structurizr/cli/releases/download/v1.33.1/structurizr-cli-1.33.1.zip" +ARG STRUCTURIZR_CLI_URL="https://github.com/structurizr/cli/releases/download/v1.35.0/structurizr-cli-1.35.0.zip" RUN sudo wget -q "${STRUCTURIZR_CLI_URL}" -O ./structurizr.zip \ && sudo unzip structurizr.zip -d /usr/bin/structurizr \ && sudo ln -s /usr/bin/structurizr/structurizr.sh /usr/bin/structurizr/structurizr \