Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Firefox 134 and migrate back to conda #1109

Merged
merged 8 commits into from
Jan 16, 2025
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
18 changes: 9 additions & 9 deletions .github/actions/setup/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,28 @@ runs:
using: "composite"
steps:
# All of these steps are just setup
- name: Setting MAMBA_PATH
- name: Setting CONDA_PATH
shell: bash
run: echo "MAMBA_PATH=$HOME/mamba" >> $GITHUB_ENV
- name: Setting OPENWPM_MAMBA_PATH
run: echo "CONDA_PATH=$HOME/conda" >> $GITHUB_ENV
- name: Setting OPENWPM_CONDA_PATH
shell: bash
run: echo "OPENWPM_MAMBA_PATH=$MAMBA_PATH/envs/openwpm" >> $GITHUB_ENV
run: echo "OPENWPM_CONDA_PATH=$CONDA_PATH/envs/openwpm" >> $GITHUB_ENV
# If the environment.yaml hasn't changed we just reuse the entire conda install
- id: cache
uses: actions/cache@v4
env:
cache-name: conda-cache
with:
path: ${{ env.MAMBA_PATH }}
path: ${{ env.CONDA_PATH }}
key: ${{ env.cache-name }}-${{ hashFiles('environment.yaml') }}

- name: Install conda
shell: bash
if: ${{ steps.cache.outputs.cache-hit != 'true' }}
run: $GITHUB_WORKSPACE/scripts/install-mamba.sh
run: $GITHUB_WORKSPACE/scripts/install-conda.sh

- shell: bash
run: echo "$MAMBA_PATH/bin" >> $GITHUB_PATH
run: echo "$CONDA_PATH/bin" >> $GITHUB_PATH

- name: Install.sh (cache miss)
shell: bash
Expand All @@ -36,5 +36,5 @@ runs:
if: ${{ steps.cache.outputs.cache-hit == 'true' }}
run: $GITHUB_WORKSPACE/install.sh --skip-create
- shell: bash
run: echo "$OPENWPM_MAMBA_PATH/bin" >> $GITHUB_PATH
# Now we have a working OpenWPM environment
run: echo "$OPENWPM_CONDA_PATH/bin" >> $GITHUB_PATH
# Now we have a working OpenWPM environment
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Changelog

## v0.31.0 - 2025-01-15

Bump to Firefox 134
Migrate from mamba back to conda now that mamba has merged into conda

## v0.30.0 - 2024-09-30

Bump to Firefox 130
Expand Down
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,21 @@ RUN apt-get clean -qq \
&& apt-get clean -qq \
&& apt-get update -qq \
&& apt-get upgrade -qq \
# git and make for `npm install`, wget for `install-mamba`
# git and make for `npm install`, wget for `install-conda`
&& apt-get install wget git make -qq \
# deps to run firefox inc. with xvfb
&& apt-get install firefox xvfb libgtk-3-dev libasound2 libdbus-glib-1-2 libpci3 -qq

ENV HOME /opt
COPY scripts/install-mamba.sh .
RUN ./install-mamba.sh
ENV PATH $HOME/mamba/bin:$PATH
COPY scripts/install-conda.sh .
RUN ./install-conda.sh
ENV PATH $HOME/conda/bin:$PATH

# Install OpenWPM
WORKDIR /opt/OpenWPM
COPY . .
RUN ./install.sh
ENV PATH $HOME/mamba/envs/openwpm/bin:$PATH
ENV PATH $HOME/conda/envs/openwpm/bin:$PATH

# Move the firefox binary away from the /opt/OpenWPM root so that it is available if
# we mount a local source code directory as /opt/OpenWPM
Expand Down
Loading
Loading