Skip to content

Commit

Permalink
Merge pull request #4 from symless/rename-containers
Browse files Browse the repository at this point in the history
Rename Docker containers to new name
  • Loading branch information
nbolton authored Oct 23, 2024
2 parents 6febcb6 + a7bd609 commit bb5eaea
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 59 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,6 @@ jobs:
push: true
context: .
file: ./.github/docker/${{ matrix.os.config-dir }}/Dockerfile
tags: symless/synergy-core:${{ matrix.os.name }}
tags: deskflow/deskflow:${{ matrix.os.name }}
build-args: BASE_IMAGE=${{ matrix.os.base-image }}
platforms: linux/${{ matrix.os.platform }}
26 changes: 13 additions & 13 deletions .github/workflows/ci-linux.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,73 +2,73 @@
"distro": [
{
"name": "debian-13-amd64",
"container": "symless/synergy-core:debian-13-amd64",
"container": "deskflow/deskflow:debian-13-amd64",
"runs-on": "ubuntu-latest",
"extra-packages": true
},
{
"name": "debian-12-arm64",
"container": "symless/synergy-core:debian-12-arm64",
"container": "deskflow/deskflow:debian-12-arm64",
"runs-on": "ubuntu-24.04-8-core-arm64",
"extra-packages": true
},
{
"name": "debian-12-amd64",
"container": "symless/synergy-core:debian-12-amd64",
"container": "deskflow/deskflow:debian-12-amd64",
"runs-on": "ubuntu-latest",
"extra-packages": true
},
{
"name": "ubuntu-24.04-amd64",
"container": "symless/synergy-core:ubuntu-24.04-amd64",
"container": "deskflow/deskflow:ubuntu-24.04-amd64",
"runs-on": "ubuntu-latest",
"extra-dep-args": "--meson-no-system libportal --meson-static libportal --subprojects",
"extra-cmake-args": "-DSYSTEM_LIBPORTAL=OFF -DSTATIC_LIBPORTAL=ON"
},
{
"name": "ubuntu-22.04-amd64",
"container": "symless/synergy-core:ubuntu-22.04-amd64",
"container": "deskflow/deskflow:ubuntu-22.04-amd64",
"runs-on": "ubuntu-latest"
},
{
"name": "fedora-40-arm64",
"container": "symless/synergy-core:fedora-40-arm64",
"container": "deskflow/deskflow:fedora-40-arm64",
"runs-on": "ubuntu-24.04-8-core-arm64"
},
{
"name": "fedora-40-amd64",
"container": "symless/synergy-core:fedora-40-amd64",
"container": "deskflow/deskflow:fedora-40-amd64",
"runs-on": "ubuntu-latest"
},
{
"name": "fedora-39-amd64",
"container": "symless/synergy-core:fedora-39-amd64",
"container": "deskflow/deskflow:fedora-39-amd64",
"runs-on": "ubuntu-latest"
},
{
"name": "opensuse-amd64",
"container": "symless/synergy-core:opensuse-amd64",
"container": "deskflow/deskflow:opensuse-amd64",
"runs-on": "ubuntu-latest"
},
{
"name": "rockylinux-9-amd64",
"container": "symless/synergy-core:rockylinux-9-amd64",
"container": "deskflow/deskflow:rockylinux-9-amd64",
"runs-on": "ubuntu-latest"
},
{
"name": "almalinux-9-amd64",
"container": "symless/synergy-core:almalinux-9-amd64",
"container": "deskflow/deskflow:almalinux-9-amd64",
"runs-on": "ubuntu-latest"
},
{
"name": "archlinux-amd64",
"container": "symless/synergy-core:archlinux-amd64",
"container": "deskflow/deskflow:archlinux-amd64",
"runs-on": "ubuntu-latest",
"package-user": "build"
},
{
"name": "manjaro-amd64",
"container": "symless/synergy-core:manjaro-amd64",
"container": "deskflow/deskflow:manjaro-amd64",
"runs-on": "ubuntu-latest",
"package-user": "build"
}
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 @@ -17,7 +17,7 @@ jobs:

name: Analyze
runs-on: ${{ vars.CODEQL_RUNNER || 'ubuntu-24.04' }}
container: symless/synergy-core:ubuntu-24.04-amd64
container: deskflow/deskflow:ubuntu-24.04-amd64
timeout-minutes: 20

strategy:
Expand Down
42 changes: 0 additions & 42 deletions .github/workflows/lint-changelog.yml

This file was deleted.

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

runs-on: ${{ vars.SONAR_SCANNER_RUNNER || 'ubuntu-24.04' }}
container: symless/synergy-core:ubuntu-22.04-amd64
container: deskflow/deskflow:ubuntu-22.04-amd64
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 @@ -12,7 +12,7 @@ on:
jobs:
valgrind-analysis:
runs-on: ubuntu-latest
container: symless/synergy-core:ubuntu-22.04-amd64
container: deskflow/deskflow:ubuntu-22.04-amd64
timeout-minutes: 10

steps:
Expand Down

0 comments on commit bb5eaea

Please sign in to comment.