Skip to content

Commit

Permalink
Run docker as current user
Browse files Browse the repository at this point in the history
  • Loading branch information
ls-1801 committed Apr 23, 2024
1 parent b6e42e6 commit 04c0cf9
Showing 1 changed file with 31 additions and 8 deletions.
39 changes: 31 additions & 8 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,27 +47,50 @@ jobs:
- name: Build Docker
id: builddocker
working-directory: ${{ github.workspace }}/docker/
run: docker build -t nes_dep_build_${{ matrix.osversion }} -f Dockerfile-${{ matrix.osversion }} .
run: |
docker build \
-t nes_dep_build_${{ matrix.osversion }} \
-f Dockerfile-${{ matrix.osversion }} \
.
- name: Install vcpkg
id: bootstrapvcpkg
run: |
docker run -e ARCH=${{ matrix.arch }} -v ${{ github.workspace }}:/build_dir --rm nes_dep_build_${{ matrix.osversion }} /build_dir/vcpkg/bootstrap-vcpkg.sh -disableMetrics
docker run \
-u $(id -u ${USER}):$(id -g ${USER}) \
-e ARCH=${{ matrix.arch }} \
-v ${{ github.workspace }}:/build_dir \
--rm \
nes_dep_build_${{ matrix.osversion }} /build_dir/vcpkg/bootstrap-vcpkg.sh -disableMetrics
shell: bash
- name: Install dependencies in manifest mode
id: installdeps
run: |
docker run -e ARCH=${{ matrix.arch }} -v ${{ github.workspace }}:/build_dir --rm nes_dep_build_${{ matrix.osversion }} \
/build_dir/vcpkg/vcpkg install --triplet=${{ env.VCPKG_DEP_LIST }}-nes \
--host-triplet=${{ env.VCPKG_DEP_LIST }}-nes --overlay-triplets=/build_dir/custom-triplets/ --x-manifest-root=/build_dir/ --overlay-ports=/build_dir/vcpkg-registry/ports
docker run \
-u $(id -u ${USER}):$(id -g ${USER}) \
-e ARCH=${{ matrix.arch }} \
-v ${{ github.workspace }}:/build_dir \
--rm \
nes_dep_build_${{ matrix.osversion }} /build_dir/vcpkg/vcpkg install \
--triplet=${{ env.VCPKG_DEP_LIST }}-nes \
--host-triplet=${{ env.VCPKG_DEP_LIST }}-nes \
--overlay-triplets=/build_dir/custom-triplets/ \
--x-manifest-root=/build_dir/ \
--overlay-ports=/build_dir/vcpkg-registry/ports
- name: Compress artifacts
id: compressdeps
run: |
mkdir nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes && \
mv ${{ github.workspace }}/vcpkg_installed nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes/installed && \
mv \
${{ github.workspace }}/vcpkg_installed \
nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes/installed && \
mkdir -p nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes/scripts/buildsystems && \
cp ${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake ${{ github.workspace }}/nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes/scripts/buildsystems/ && \
cp \
${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake \
${{ github.workspace }}/nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes/scripts/buildsystems/ && \
touch ${{ github.workspace }}/nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes/.vcpkg-root && \
7z a nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-${{ matrix.osversion }}-nes.7z nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes -mx9 -aoa
7z a -mx9 -aoa \
nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-${{ matrix.osversion }}-nes.7z \
nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes
- name: Release
uses: softprops/action-gh-release@v1
id: createrelease
Expand Down

0 comments on commit 04c0cf9

Please sign in to comment.