From c3fe41af71299be637ca33770b4b769a95d7bb94 Mon Sep 17 00:00:00 2001 From: Merlin Jehli Date: Sun, 26 Jan 2025 13:07:24 +0100 Subject: [PATCH] updated template --- .forgejo/workflows/build_image.yml | 4 +++- example_pc/example_pc.yml | 4 ++-- generic_kde/generic_kde.yml | 4 ++-- renovate.json | 18 ++---------------- 4 files changed, 9 insertions(+), 21 deletions(-) diff --git a/.forgejo/workflows/build_image.yml b/.forgejo/workflows/build_image.yml index 85006fa..e83378d 100644 --- a/.forgejo/workflows/build_image.yml +++ b/.forgejo/workflows/build_image.yml @@ -11,7 +11,7 @@ concurrency: jobs: build-image: - runs-on: ubuntu-latest + runs-on: ubuntu-latest-shared steps: - name: Checkout uses: actions/checkout@v4 @@ -32,6 +32,8 @@ jobs: layer_config_file: layers_config.yml out_dir: ${{ gitea.workspace }}/out version: ${{ steps.version.outputs.RELEASE_VERSION }} + registry_username: ${{ gitea.actor }} + registry_password: ${{ secrets.PACKET_TOKEN }} sb_db_pem: ${{ secrets.SB_DB_PEM }} sb_db_key: ${{ secrets.SB_DB_KEY }} api_auth_token: ${{ secrets.API_AUTH_TOKEN }} diff --git a/example_pc/example_pc.yml b/example_pc/example_pc.yml index 7529cc2..d195340 100644 --- a/example_pc/example_pc.yml +++ b/example_pc/example_pc.yml @@ -1,6 +1,6 @@ # yaml-language-server: $schema=https://git.fml128.ch/FML128/idkyet-builder/raw/branch/main/schemas/layer.json -id: example_pc -previous_layer_id: generic_kde +id: git.fml128.ch/fml128/idkyet-example_pc +previous_layer_id: git.fml128.ch/fml128/idkyet-generic_kde build_mode: 2 secure_boot: false # To enable follow setup guide packets: diff --git a/generic_kde/generic_kde.yml b/generic_kde/generic_kde.yml index 96f39ad..9145792 100644 --- a/generic_kde/generic_kde.yml +++ b/generic_kde/generic_kde.yml @@ -1,6 +1,6 @@ # yaml-language-server: $schema=https://git.fml128.ch/FML128/idkyet-builder/raw/branch/main/schemas/layer.json -id: generic_kde -previous_layer_id: https://git.fml128.ch/FML128/idkyet-base/kde:2025.01.252334 +id: git.fml128.ch/fml128/idkyet-generic_kde +previous_layer_id: git.fml128.ch/fml128/idkyet-kde:2025.01.252334 packets: - element-desktop - owncloud-client diff --git a/renovate.json b/renovate.json index 17c713d..9792053 100644 --- a/renovate.json +++ b/renovate.json @@ -1,20 +1,6 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": [ - "local>FML128/renovate-config" - ], - "customManagers": [ - { - "description": "idkyet updater", - "customType": "regex", - "fileMatch": [ - "^.+\\.ya?ml$" - ], - "matchStrings": [ - "previous_layer_id:\\s(?https?://[^/:]+)/(?[^:]+\\/[^:]+)\\/[^:]+:(?\\S+)" - ], - "datasourceTemplate": "gitea-tags", - "versioningTemplate": "loose" - } + "local>FML128/idkyet-builder-action" ] -} +} \ No newline at end of file