Skip to content

Commit

Permalink
MRG: Unify changes in the output
Browse files Browse the repository at this point in the history
  • Loading branch information
thclark committed Jul 9, 2024
2 parents bb209ba + 93889ff commit 29fcc2c
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 5 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
needs: coolname
strategy:
matrix:
python: ["3.8", "3.9", "3.10"]
python: ["3.9", "3.10", "3.11"]
gdal: ["2.4.1"]
mode: ["slim", "dev"]
runs-on: ubuntu-latest
Expand All @@ -43,11 +43,11 @@ jobs:
id: vars
run: |
if (test ${{ matrix.mode }} = slim) then
echo ::set-output name=base_image::"python:${{ matrix.python }}-slim-bookworm"
echo ::set-output name=install_dev_tools::"false"
echo "base_image=python:${{ matrix.python }}-slim-bookworm" >> $GITHUB_OUTPUT
echo "install_dev_tools=false" >> $GITHUB_OUTPUT
elif (test ${{ matrix.mode }} = dev) then
echo "::set-output name=base_image::mcr.microsoft.com/vscode/devcontainers/python:1-${{ matrix.python }}-bookworm"
echo "::set-output name=install_dev_tools::true"
echo "base_image=mcr.microsoft.com/vscode/devcontainers/python:1-${{ matrix.python }}-bookworm" >> $GITHUB_OUTPUT
echo "install_dev_tools=true" >> $GITHUB_OUTPUT
fi
- name: Set up QEMU
Expand Down
26 changes: 26 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -134,3 +134,29 @@ RUN if [ "${INSTALL_DEV_TOOLS}" = "true" ]; then \

# Setting this ensures print statements and log messages promptly appear
ENV PYTHONUNBUFFERED TRUE

# Tell zsh where you want to store history
# This folder is mapped into the container, so that history will persist over container rebuilds.
#
# !!!IMPORTANT!!!
# Make sure your .zsh_history file is NOT committed into your repository, as it can contain
# sensitive information. You should add
# .devcontainer/.zsh_history
# to your .gitignore file.
#
WORKDIR /workspace
ENV HISTFILE="/workspace/.devcontainer/.zsh_history"

# Install poetry
# USER vscode
# ENV POETRY_HOME=/home/vscode/.poetry
# RUN curl -sSL https://install.python-poetry.org | python -
# ENV PATH "$POETRY_HOME/bin:$PATH"
# RUN poetry config virtualenvs.create false

# # Overcome the fact that yarn don't bother putting their keys on the ring (required for installing sshd feature)...
# # https://github.com/yarnpkg/yarn/issues/7866#issuecomment-1404052064
# RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo gpg --dearmour -o "/usr/share/keyrings/yarn-keyring.gpg" & \
# echo "deb [signed-by=/usr/share/keyrings/yarn-keyring.gpg] https://dl.yarnpkg.com/debian stable main" | tee /etc/apt/sources.list.d/yarn.list & \
# gpg --refresh-keys & \
# apt-get update -y

0 comments on commit 29fcc2c

Please sign in to comment.