Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/github_actions/docker/build-push-…
Browse files Browse the repository at this point in the history
…action-6
  • Loading branch information
wanjohiryan authored Jun 26, 2024
2 parents 5df19ca + 9e9411c commit 3867f5d
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- uses: amannn/action-semantic-pull-request@cfb60706e18bc85e8aec535e3c577abe8f70378e
id: lint_pr_title
env:
GITHUB_TOKEN: ${{ secrets.GIT_MASTER_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
types: |-
build
Expand Down Expand Up @@ -80,14 +80,14 @@ jobs:
permissions:
contents: read
pull-requests: write
issues: write
steps:
- name: Checkout your code
uses: actions/checkout@v4

- uses: srvaroa/labeler@v1
with:
config_path: .github/labeler.yml
use_local_config: true #FIXME:
fail_on_error: true
env:
GITHUB_TOKEN: "${{ secrets.GIT_MASTER_TOKEN }}"
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
7 changes: 4 additions & 3 deletions base.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,9 @@ RUN apt-get update -y \
&& find . -maxdepth 1 -type f -name "*libnvrtc.so.*" -exec sh -c 'ln -snf $(basename {}) libnvrtc.so' \; \
&& mkdir -p /usr/local/nvidia/lib && mv -f libnvrtc* /usr/local/nvidia/lib \
&& git clone https://repo.dec05eba.com/gpu-screen-recorder && cd gpu-screen-recorder \
&& chmod +x ./build.sh ./install.sh \
&& ./install.sh
&& meson setup build \
&& meson configure --prefix=/usr --buildtype=release -Dsystemd=true -Dstrip=true build \
&& ninja -C build install

# #Try building shadow-cast
# RUN git clone https://github.com/gmbeard/shadow-cast && cd shadow-cast \
Expand Down Expand Up @@ -285,4 +286,4 @@ RUN apt-get update \
libelf-dev \
pkg-config \
xorg \
&& rm -rf /var/lib/apt/lists/*
&& rm -rf /var/lib/apt/lists/*
2 changes: 1 addition & 1 deletion moq-server

0 comments on commit 3867f5d

Please sign in to comment.