From 69e79105a338b6de7f26d6e7267abec40e1e1ada Mon Sep 17 00:00:00 2001 From: Victor Date: Fri, 26 May 2023 21:21:13 +0200 Subject: [PATCH 01/13] test ci 2 --- .forgejo/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/test.yml b/.forgejo/workflows/test.yml index 90f69a3..e1becaa 100644 --- a/.forgejo/workflows/test.yml +++ b/.forgejo/workflows/test.yml @@ -2,7 +2,7 @@ name: Test on: [push] jobs: setup-forgejo: - runs-on: nix-native + runs-on: native steps: - uses: actions/checkout@v3 - run: | -- 2.46.0 From 47f6105bf45e1c28b30bdb6948bd7c25ba895142 Mon Sep 17 00:00:00 2001 From: Victor Date: Fri, 26 May 2023 21:23:57 +0200 Subject: [PATCH 02/13] test ci 3 --- .forgejo/workflows/test.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/test.yml b/.forgejo/workflows/test.yml index e1becaa..a1ff002 100644 --- a/.forgejo/workflows/test.yml +++ b/.forgejo/workflows/test.yml @@ -1,10 +1,9 @@ name: Test on: [push] jobs: - setup-forgejo: + native-test: runs-on: native steps: - uses: actions/checkout@v3 - run: | - ls - echo "Hello, World!" + nix --version -- 2.46.0 From 567c2219140a177b63087df3c5c97d9ab2de5fa0 Mon Sep 17 00:00:00 2001 From: Victor Date: Fri, 26 May 2023 21:31:20 +0200 Subject: [PATCH 03/13] add nix to ci --- nixos/hosts/olympus/woodpecker/configuration.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/hosts/olympus/woodpecker/configuration.nix b/nixos/hosts/olympus/woodpecker/configuration.nix index 078b333..b322124 100644 --- a/nixos/hosts/olympus/woodpecker/configuration.nix +++ b/nixos/hosts/olympus/woodpecker/configuration.nix @@ -27,7 +27,9 @@ in { quoteEnvironmentValues = false; # Needed for docker }; - vault-secrets.secrets.gitea_runner = { }; + vault-secrets.secrets.gitea_runner = { + services = [ "gitea-runner-nix\x2dnative" ]; + }; virtualisation.podman = { enable = true; @@ -60,6 +62,7 @@ in { gitMinimal gnused nodejs + nix wget ]; }; -- 2.46.0 From 6deec53c0f34d5e9f574d5bbea32454185882ddf Mon Sep 17 00:00:00 2001 From: Victor Date: Fri, 26 May 2023 21:33:00 +0200 Subject: [PATCH 04/13] test flake --- .forgejo/workflows/test.yml | 2 +- nixos/hosts/olympus/woodpecker/configuration.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/test.yml b/.forgejo/workflows/test.yml index a1ff002..5ab65d4 100644 --- a/.forgejo/workflows/test.yml +++ b/.forgejo/workflows/test.yml @@ -6,4 +6,4 @@ jobs: steps: - uses: actions/checkout@v3 - run: | - nix --version + nix flake info diff --git a/nixos/hosts/olympus/woodpecker/configuration.nix b/nixos/hosts/olympus/woodpecker/configuration.nix index b322124..20d603a 100644 --- a/nixos/hosts/olympus/woodpecker/configuration.nix +++ b/nixos/hosts/olympus/woodpecker/configuration.nix @@ -62,7 +62,7 @@ in { gitMinimal gnused nodejs - nix + nixUnstable wget ]; }; -- 2.46.0 From 920305ef7d226f28fb818326ef7fdf2be721c2f5 Mon Sep 17 00:00:00 2001 From: Victor Date: Fri, 26 May 2023 21:55:26 +0200 Subject: [PATCH 05/13] ci test 1 --- .forgejo/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/test.yml b/.forgejo/workflows/test.yml index 5ab65d4..0ee0801 100644 --- a/.forgejo/workflows/test.yml +++ b/.forgejo/workflows/test.yml @@ -6,4 +6,4 @@ jobs: steps: - uses: actions/checkout@v3 - run: | - nix flake info + nix flake metadata -- 2.46.0 From 8387316a3d3dcde467c0345bc2b9576c4c7ff946 Mon Sep 17 00:00:00 2001 From: Victor Date: Fri, 26 May 2023 21:58:13 +0200 Subject: [PATCH 06/13] ci test 42 --- .forgejo/workflows/test.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.forgejo/workflows/test.yml b/.forgejo/workflows/test.yml index 0ee0801..b88fb75 100644 --- a/.forgejo/workflows/test.yml +++ b/.forgejo/workflows/test.yml @@ -6,4 +6,7 @@ jobs: steps: - uses: actions/checkout@v3 - run: | - nix flake metadata + pwd + mkdir a + ./nixos/pkgs/plex-pass/update.sh + -- 2.46.0 From ef13efcb5fde17dcca641974ef37c89fd247a1bc Mon Sep 17 00:00:00 2001 From: Victor Date: Fri, 26 May 2023 22:01:24 +0200 Subject: [PATCH 07/13] test plex update sh --- nixos/hosts/olympus/woodpecker/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/hosts/olympus/woodpecker/configuration.nix b/nixos/hosts/olympus/woodpecker/configuration.nix index 20d603a..727a95b 100644 --- a/nixos/hosts/olympus/woodpecker/configuration.nix +++ b/nixos/hosts/olympus/woodpecker/configuration.nix @@ -63,6 +63,7 @@ in { gnused nodejs nixUnstable + vault wget ]; }; -- 2.46.0 From ad3d8b878ce3d040ca49d87428ca47edac98737c Mon Sep 17 00:00:00 2001 From: Victor Date: Fri, 26 May 2023 22:06:28 +0200 Subject: [PATCH 08/13] test plex update sh --- .forgejo/workflows/test.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.forgejo/workflows/test.yml b/.forgejo/workflows/test.yml index b88fb75..be724fd 100644 --- a/.forgejo/workflows/test.yml +++ b/.forgejo/workflows/test.yml @@ -5,7 +5,9 @@ jobs: runs-on: native steps: - uses: actions/checkout@v3 - - run: | + - env: + VAULT_TOKEN: ${{ secrets.VAULT_TOKEN }} + run: | pwd mkdir a ./nixos/pkgs/plex-pass/update.sh -- 2.46.0 From 507ef284bb7984b38a1f51d0b00c6575da2d54e4 Mon Sep 17 00:00:00 2001 From: Victor Date: Fri, 26 May 2023 22:07:07 +0200 Subject: [PATCH 09/13] test plex update sh --- .forgejo/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.forgejo/workflows/test.yml b/.forgejo/workflows/test.yml index be724fd..6a4317f 100644 --- a/.forgejo/workflows/test.yml +++ b/.forgejo/workflows/test.yml @@ -6,6 +6,7 @@ jobs: steps: - uses: actions/checkout@v3 - env: + VAULT_ADDR: ${{ secrets.VAULT_ADDR }} VAULT_TOKEN: ${{ secrets.VAULT_TOKEN }} run: | pwd -- 2.46.0 From 0b8c9aa8f5c561da31a6a1c591e2586a21a7f1a5 Mon Sep 17 00:00:00 2001 From: Victor Date: Fri, 26 May 2023 22:09:42 +0200 Subject: [PATCH 10/13] install jq --- nixos/hosts/olympus/woodpecker/configuration.nix | 1 + nixos/pkgs/plex-pass/update.sh | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/hosts/olympus/woodpecker/configuration.nix b/nixos/hosts/olympus/woodpecker/configuration.nix index 727a95b..9c5d0c2 100644 --- a/nixos/hosts/olympus/woodpecker/configuration.nix +++ b/nixos/hosts/olympus/woodpecker/configuration.nix @@ -61,6 +61,7 @@ in { gawk gitMinimal gnused + jq nodejs nixUnstable vault diff --git a/nixos/pkgs/plex-pass/update.sh b/nixos/pkgs/plex-pass/update.sh index 4dc8e12..90c07c3 100755 --- a/nixos/pkgs/plex-pass/update.sh +++ b/nixos/pkgs/plex-pass/update.sh @@ -1,6 +1,4 @@ #! /usr/bin/env bash - -set -x shopt -s extglob set -eu -o pipefail -- 2.46.0 From a8d3aaa796d8d215395ffda6150a3296b7ba4f34 Mon Sep 17 00:00:00 2001 From: Victor Date: Fri, 26 May 2023 22:14:16 +0200 Subject: [PATCH 11/13] test git push --- .forgejo/workflows/{test.yml => plex_update.yml} | 9 ++++++--- nixos/pkgs/plex-pass/sources.json | 14 -------------- 2 files changed, 6 insertions(+), 17 deletions(-) rename .forgejo/workflows/{test.yml => plex_update.yml} (54%) delete mode 100644 nixos/pkgs/plex-pass/sources.json diff --git a/.forgejo/workflows/test.yml b/.forgejo/workflows/plex_update.yml similarity index 54% rename from .forgejo/workflows/test.yml rename to .forgejo/workflows/plex_update.yml index 6a4317f..789e8b5 100644 --- a/.forgejo/workflows/test.yml +++ b/.forgejo/workflows/plex_update.yml @@ -1,4 +1,4 @@ -name: Test +name: Plex Update on: [push] jobs: native-test: @@ -9,7 +9,10 @@ jobs: VAULT_ADDR: ${{ secrets.VAULT_ADDR }} VAULT_TOKEN: ${{ secrets.VAULT_TOKEN }} run: | - pwd - mkdir a + git config user.name "Forgejo Actions Bot" + git config user.email "<>" ./nixos/pkgs/plex-pass/update.sh + git add ./nixos/pkgs/plex-pass/ + git commit -m "Update Plex" + git push origin main diff --git a/nixos/pkgs/plex-pass/sources.json b/nixos/pkgs/plex-pass/sources.json deleted file mode 100644 index e7fbf52..0000000 --- a/nixos/pkgs/plex-pass/sources.json +++ /dev/null @@ -1,14 +0,0 @@ -[ - { - "version": "1.32.3.7089", - "platform": "aarch64-linux", - "url": "https://downloads.plex.tv/plex-media-server-new/1.32.3.7089-b0a36929b/debian/plexmediaserver_1.32.3.7089-b0a36929b_arm64.deb", - "hash": "1sc6h04l0lxw3jzz01gn7i6wikqqds7nqh35rqvwhffjgdvmcjhq" - }, - { - "version": "1.32.3.7089", - "platform": "x86_64-linux", - "url": "https://downloads.plex.tv/plex-media-server-new/1.32.3.7089-b0a36929b/debian/plexmediaserver_1.32.3.7089-b0a36929b_amd64.deb", - "hash": "074qvjl49rfn6s3naa5s71i5kd0an64laijz13cpsh55yy6zwgb3" - } -] -- 2.46.0 From 234ced44004db8bc02afead1d12f0f81ab447d7d Mon Sep 17 00:00:00 2001 From: Victor Date: Fri, 26 May 2023 22:14:51 +0200 Subject: [PATCH 12/13] test git push --- .forgejo/workflows/plex_update.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/plex_update.yml b/.forgejo/workflows/plex_update.yml index 789e8b5..a9ed633 100644 --- a/.forgejo/workflows/plex_update.yml +++ b/.forgejo/workflows/plex_update.yml @@ -14,5 +14,5 @@ jobs: ./nixos/pkgs/plex-pass/update.sh git add ./nixos/pkgs/plex-pass/ git commit -m "Update Plex" - git push origin main + git push origin actions-ci -- 2.46.0 From 0075a35919613dec52d9fd0c56027bdec546b102 Mon Sep 17 00:00:00 2001 From: Forgejo Actions Bot <> Date: Fri, 26 May 2023 22:15:02 +0200 Subject: [PATCH 13/13] Update Plex --- nixos/pkgs/plex-pass/sources.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 nixos/pkgs/plex-pass/sources.json diff --git a/nixos/pkgs/plex-pass/sources.json b/nixos/pkgs/plex-pass/sources.json new file mode 100644 index 0000000..e7fbf52 --- /dev/null +++ b/nixos/pkgs/plex-pass/sources.json @@ -0,0 +1,14 @@ +[ + { + "version": "1.32.3.7089", + "platform": "aarch64-linux", + "url": "https://downloads.plex.tv/plex-media-server-new/1.32.3.7089-b0a36929b/debian/plexmediaserver_1.32.3.7089-b0a36929b_arm64.deb", + "hash": "1sc6h04l0lxw3jzz01gn7i6wikqqds7nqh35rqvwhffjgdvmcjhq" + }, + { + "version": "1.32.3.7089", + "platform": "x86_64-linux", + "url": "https://downloads.plex.tv/plex-media-server-new/1.32.3.7089-b0a36929b/debian/plexmediaserver_1.32.3.7089-b0a36929b_amd64.deb", + "hash": "074qvjl49rfn6s3naa5s71i5kd0an64laijz13cpsh55yy6zwgb3" + } +] -- 2.46.0