Skip to content

Commit 810b895

Browse files
authored
Merge pull request #506 from myoung34/software-properties-common-trixie
Remove software-properties-common to potentially fix trixie (sid?)
2 parents e562eeb + 1370fbe commit 810b895

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

.github/workflows/base.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
runs-on: ubuntu-latest
8181
strategy:
8282
matrix:
83-
release: [bookworm, sid]
83+
release: [bookworm, trixie]
8484
platform: [amd64, arm64]
8585
fail-fast: false
8686
steps:
@@ -220,7 +220,7 @@ jobs:
220220
needs: debian_base_tests
221221
strategy:
222222
matrix:
223-
release: [bookworm, sid]
223+
release: [bookworm, trixig]
224224
fail-fast: false
225225
steps:
226226
- name: Copy Repo Files

.github/workflows/deploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ jobs:
131131
runs-on: ubuntu-latest
132132
strategy:
133133
matrix:
134-
release: [bookworm, sid]
134+
release: [bookworm, trixie]
135135
platform: [amd64, arm64]
136136
fail-fast: false
137137
steps:
@@ -327,7 +327,7 @@ jobs:
327327
needs: debian_tests
328328
strategy:
329329
matrix:
330-
release: [bookworm, sid]
330+
release: [bookworm, trixie]
331331
fail-fast: false
332332
steps:
333333
- name: Copy Repo Files

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ jobs:
125125
runs-on: ubuntu-latest
126126
strategy:
127127
matrix:
128-
release: [bookworm, sid]
128+
release: [bookworm, trixie]
129129
fail-fast: false
130130
needs: create-release
131131
steps:

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ jobs:
132132
runs-on: ubuntu-latest
133133
strategy:
134134
matrix:
135-
release: [bookworm, sid]
135+
release: [bookworm, trixie]
136136
platform: [amd64, arm64]
137137
fail-fast: false
138138
steps:

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ Currently runners [do not support containerd](https://github.com/actions/runner/
4545
| ubuntu jammy | `x86_64`,`arm64` | `/\d\.\d{3}\.\d+-ubuntu-jammy/` | [ubuntu-jammy](https://hub.docker.com/r/myoung34/github-runner/tags?page=1&name=ubuntu-jammy) | This is the latest build from jammy (Rebuilt nightly and on master merges). Tags with `-ubuntu-jammy` are included and created on [upstream tags](https://github.com/actions/runner/tags). | There is [currently an issue with jammy from inside a 20.04LTS host](https://github.com/myoung34/docker-github-actions-runner/issues/219) which is why this is not `latest` |
4646
| debian buster (now deprecated) | `x86_64`,`arm64` | `/\d\.\d{3}\.\d+-debian-buster/` | [debian-buster](https://hub.docker.com/r/myoung34/github-runner/tags?page=1&name=debian-buster) | Debian buster is now deprecated. The packages for arm v7 are in flux and are wildly causing build failures (git as well as liblttng-ust#. Tags with `-debian-buster` are included and created on [upstream tags](https://github.com/actions/runner/tags). | |
4747
| debian bookworm | `x86_64`,`arm64` | `/\d\.\d{3}\.\d+-debian-bookworm/` | [debian-bookworm](https://hub.docker.com/r/myoung34/github-runner/tags?page=1&name=debian-bookworm) | This is the latest build from bookworm (Rebuilt nightly and on master merges). Tags with `-debian-bookworm` are included and created on [upstream tags](https://github.com/actions/runner/tags). | |
48-
| debian sid | `x86_64`,`arm64` | `/\d\.\d{3}\.\d+-debian-sid/` | [debian-sid](https://hub.docker.com/r/myoung34/github-runner/tags?page=1&name=debian-sid) | This is the latest build from sid (Rebuilt nightly and on master merges). Tags with `-debian-sid` are included and created on [upstream tags](https://github.com/actions/runner/tags). | |
48+
| debian trixie | `x86_64`,`arm64` | `/\d\.\d{3}\.\d+-debian-trixie/` | [debian-trixie](https://hub.docker.com/r/myoung34/github-runner/tags?page=1&name=debian-trixie) | This is the latest build from trixie (Rebuilt nightly and on master merges). Tags with `-debian-trixie` are included and created on [upstream tags](https://github.com/actions/runner/tags). | |
49+
| ~~debian sid~~ | `x86_64`,`arm64` | `/\d\.\d{3}\.\d+-debian-sid/` | [debian-sid](https://hub.docker.com/r/myoung34/github-runner/tags?page=1&name=debian-sid) | This is currently disabled as it is failing until `forky` is included in https://download.docker.com/linux/debian/dists/ ~~This is the latest build from sid (Rebuilt nightly and on master merges). Tags with `-debian-sid` are included and created on [upstream tags](https://github.com/actions/runner/tags).~~ | |
4950

5051
These containers are built via Github actions that [copy the dockerfile](https://github.com/myoung34/docker-github-actions-runner/blob/master/.github/workflows/deploy.yml#L47), changing the `FROM` and building to provide simplicity.
5152

build/config.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121
"gettext",
2222
"libcurl4-openssl-dev",
2323
"libpq-dev",
24-
"pkg-config",
25-
"software-properties-common"
24+
"pkg-config"
2625
]
2726
},
2827
{

0 commit comments

Comments
 (0)