From f70122f317d4705ea53c072026440d8e91ebdfca Mon Sep 17 00:00:00 2001 From: Jackson Delahunt Date: Fri, 15 Nov 2019 15:19:44 +1100 Subject: [PATCH] shffle --- .github/workflows/build-and-publish.yml | 4 ++-- docker/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml index a634828..12d4387 100644 --- a/.github/workflows/build-and-publish.yml +++ b/.github/workflows/build-and-publish.yml @@ -4,11 +4,11 @@ jobs: build: runs-on: ubuntu-latest steps: + - uses: actions/checkout@master - name: Build Environment env: DESKTOP_ENVIRONMENT_USER: ${{ secrets.DESKTOP_ENVIRONMENT_USER }} - run: ./docker/scripts/build.sh - - uses: actions/checkout@master + run: docker/scripts/build.sh - name: Publish to Registry uses: HurricanKai/Publish-Docker-Github-Action@master with: diff --git a/docker/Dockerfile b/docker/Dockerfile index 4c390f7..a334c25 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -232,7 +232,7 @@ RUN add-apt-repository ppa:kgilmer/speed-ricer && \ apt-get install -qq i3blocks i3-gaps i3lock-fancy && \ sed -i 's/TEXT=".*"/TEXT=""/' /usr/bin/i3lock-fancy && \ wget -qnv -O /usr/share/i3lock-fancy/lock.png http://png-pixel.com/1x1-00000000.png && \ - pip3 install --user i3-resurrect i3-workspace-names-daemon + pip3 install --force --user i3-resurrect i3-workspace-names-daemon # Install jobber RUN wget -O jobber.deb -qnv https://github.com/dshearer/jobber/releases/download/v1.4.0/jobber_1.4.0-1_amd64.deb && \ @@ -333,7 +333,7 @@ RUN apt-get update -qq && \ cd xava/build && \ cmake .. -DCMAKE_BUILD_TYPE=Debug -DINCLUDE_DIRS=lib/iniparser/src && \ make -j$(nproc) && \ - make install || true + make install # Install yarn RUN curl -fsSL https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \