From 3c6c4927b805a44011efcd2ec372dcb7d499e73a Mon Sep 17 00:00:00 2001 From: thespad Date: Fri, 26 Apr 2024 14:06:38 +0100 Subject: [PATCH 1/3] Bump actions to v7.0.2 --- .github/workflows/call-baseimage-update.yml | 4 ++-- .github/workflows/call-build-image.yml | 6 +++--- .github/workflows/call-check-and-release.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/call-baseimage-update.yml b/.github/workflows/call-baseimage-update.yml index 29e40dc..9ee93b8 100644 --- a/.github/workflows/call-baseimage-update.yml +++ b/.github/workflows/call-baseimage-update.yml @@ -7,11 +7,11 @@ on: jobs: call-workflow: - uses: linuxserver-labs/docker-actions/.github/workflows/check-baseimage-update.yml@v6 + uses: linuxserver-labs/docker-actions/.github/workflows/check-baseimage-update.yml@v7.0.2 with: repo_owner: ${{ github.repository_owner }} app_name: "omada-controller" baseimage: "ubuntu" - basebranch: "focal" + basebranch: "focal" secrets: repo_release_token: ${{ secrets.repo_release_token }} diff --git a/.github/workflows/call-build-image.yml b/.github/workflows/call-build-image.yml index 10f1242..ed15c98 100644 --- a/.github/workflows/call-build-image.yml +++ b/.github/workflows/call-build-image.yml @@ -3,15 +3,15 @@ name: Build Image On Release on: release: types: [ published ] - pull_request: + pull_request: jobs: call-workflow: - uses: linuxserver-labs/docker-actions/.github/workflows/build-image.yml@v6 + uses: linuxserver-labs/docker-actions/.github/workflows/build-image.yml@v7.0.2 with: repo_owner: ${{ github.repository_owner }} app_name: "omada-controller" release_type: "script" target-arch: "64" secrets: - scarf_token: ${{ secrets.SCARF_TOKEN }} + OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }} diff --git a/.github/workflows/call-check-and-release.yml b/.github/workflows/call-check-and-release.yml index 28a02cc..f16b77b 100644 --- a/.github/workflows/call-check-and-release.yml +++ b/.github/workflows/call-check-and-release.yml @@ -7,7 +7,7 @@ on: jobs: call-workflow: - uses: linuxserver-labs/docker-actions/.github/workflows/check-and-release.yml@v6 + uses: linuxserver-labs/docker-actions/.github/workflows/check-and-release.yml@v7.0.2 with: repo_owner: ${{ github.repository_owner }} app_name: "omada-controller" From d0a2e9fc8d18a890ae25f06d2710f07bdefb8139 Mon Sep 17 00:00:00 2001 From: thespad Date: Fri, 26 Apr 2024 14:09:38 +0100 Subject: [PATCH 2/3] Add dependabot --- .github/dependabot.yml | 11 +++++++++++ .github/workflows/stale.yml | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..724eece --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,11 @@ +# To get started with Dependabot version updates, you'll need to specify which +# package ecosystems to update and where the package manifests are located. +# Please see the documentation for all configuration options: +# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates + +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "daily" \ No newline at end of file diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 1806420..693e3e6 100755 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/stale@v1 + - uses: actions/stale@v9 with: stale-issue-message: "This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions." stale-pr-message: "This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions." From ade35ccabab8f31ea7d515bba0cc1465335cdce9 Mon Sep 17 00:00:00 2001 From: thespad Date: Fri, 26 Apr 2024 15:12:05 +0100 Subject: [PATCH 3/3] Update bakefile --- .github/workflows/permissions.yml | 10 ++++++++++ docker-bake.hcl | 14 ++------------ 2 files changed, 12 insertions(+), 12 deletions(-) create mode 100644 .github/workflows/permissions.yml diff --git a/.github/workflows/permissions.yml b/.github/workflows/permissions.yml new file mode 100644 index 0000000..1447bc5 --- /dev/null +++ b/.github/workflows/permissions.yml @@ -0,0 +1,10 @@ +name: Permission check +on: + pull_request_target: + paths: + - '**/run' + - '**/finish' + - '**/check' +jobs: + permission_check: + uses: linuxserver/github-workflows/.github/workflows/init-svc-executable-permissions.yml@v1 diff --git a/docker-bake.hcl b/docker-bake.hcl index 7e64af8..5400ab8 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -29,14 +29,6 @@ target "arm64v8" { ] } -target "arm32v7" { - inherits = ["image"] - dockerfile = "Dockerfile.armhf" - platforms = [ - "linux/arm/v7" - ] -} - target "64" { inherits = ["image"] platforms = [ @@ -48,8 +40,7 @@ target "64" { target "arm" { inherits = ["image"] platforms = [ - "linux/arm64", - "linux/arm/v7" + "linux/arm64" ] } @@ -57,7 +48,6 @@ target "all" { inherits = ["image"] platforms = [ "linux/amd64", - "linux/arm64", - "linux/arm/v7" + "linux/arm64" ] }