Skip to content

Commit

Permalink
Add python-venv and remove python packages. +semver:minor (#27)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
willson556 authored Feb 9, 2024
1 parent 16b2c10 commit e2c68b8
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/build-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions stafl-devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down

0 comments on commit e2c68b8

Please sign in to comment.