Skip to content

Commit

Permalink
ci: Drop Docker container builds (not enough time saved)
Browse files Browse the repository at this point in the history
   Add user 'build' for arch to make a package
  • Loading branch information
nbolton committed Oct 23, 2024
1 parent f26581f commit 6846a97
Show file tree
Hide file tree
Showing 9 changed files with 8 additions and 154 deletions.
17 changes: 0 additions & 17 deletions .github/docker/archlinux/Dockerfile

This file was deleted.

17 changes: 0 additions & 17 deletions .github/docker/debian/Dockerfile

This file was deleted.

16 changes: 0 additions & 16 deletions .github/docker/fedora/Dockerfile

This file was deleted.

17 changes: 0 additions & 17 deletions .github/docker/opensuse/Dockerfile

This file was deleted.

80 changes: 0 additions & 80 deletions .github/workflows/build-containers.yml

This file was deleted.

9 changes: 5 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -136,28 +136,28 @@ jobs:

- name: "debian-13-amd64"
runs-on: ubuntu-latest
container: deskflow/deskflow:debian-13-amd64
container: debian:trixie-slim
like: "debian"
timeout: 20
config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"

- name: "fedora-40-amd64"
runs-on: ubuntu-latest
container: deskflow/deskflow:fedora-40-amd64
container: fedora:40
like: "fedora"
timeout: 20
config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"

- name: "opensuse-amd64"
runs-on: ubuntu-latest
container: deskflow/deskflow:opensuse-amd64
container: opensuse/tumbleweed:latest
like: "suse"
timeout: 20
config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"

- name: "archlinux-amd64"
runs-on: ubuntu-latest
container: deskflow/deskflow:archlinux-amd64
container: archlinux:latest
like: "arch"
timeout: 20
config-args: "-G Ninja -DCMAKE_INSTALL_PREFIX=/usr"
Expand Down Expand Up @@ -215,6 +215,7 @@ jobs:
fi
if [ ${{ matrix.target.like }} == "arch" ];then
useradd -m build
sudo chown -R build build
cd build
sudo -u build makepkg -s
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:

name: Analyze
runs-on: ubuntu-latest
container: deskflow/deskflow:debian-13-amd64
container: debian:trixie-slim
timeout-minutes: 20

strategy:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sonarcloud-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
if: ${{ vars.SONAR_SCANNER_ENABLED }}

runs-on: ubuntu-latest
container: deskflow/deskflow:debian-13-amd64
container: debian:trixie-slim
timeout-minutes: 20

env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/valgrind-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
jobs:
valgrind-analysis:
runs-on: ubuntu-latest
container: deskflow/deskflow:debian-13-amd64
container: debian:trixie-slim
timeout-minutes: 10

steps:
Expand Down

0 comments on commit 6846a97

Please sign in to comment.