Update builder/action.yml

action.yml

@@ -10,21 +10,12 @@ inputs:
   version:
     description: 'version for release'
     required: true
-  registry_username:
-    description: 'username for registry'
-    required: true
-  registry_password:
-    description: 'password for registry'
-    required: true
   sb_db_key:
     description: 'secure_boot db key to sign efi'
     required: false
   sb_db_pem:
     description: 'secure_boot db pem to sign efi'
     required: false
-  api_auth_token:
-    description: 'api_auth_token if needed to download base images'
-    required: false
 #outputs:
 #  hashes:
 #    description: 'json dict of hashes of all files'
@@ -33,35 +24,22 @@ runs:
   steps:
     - name: Restore and build aur
       uses: ./aur
-      with:
-        layer_config_file: ${{ inputs.layer_config_file }}
     - name: Build images
       uses: ./builder
-      with:
-        layer_config_file: ${{ inputs.layer_config_file }}
-        out_dir: ${{ inputs.out_dir }}
-        registry_username: ${{ inputs.registry_username }}
-        registry_password: ${{ inputs.registry_password }}
-        version: ${{ inputs.version }}
-        sb_db_key: ${{ inputs.sb_db_key }}
-        sb_db_pem: ${{ inputs.sb_db_pem }}
-        api_auth_token: ${{ inputs.api_auth_token }}
-
     - name: Upload Packages
       run: |
         cd ${{ gitea.workspace }}/out
         for f in *;do
           echo "Uploading $f"
           du -sh $f
-          curl --user "${{ inputs.registry_username }}:${{ inputs.registry_password }}" \
+          curl --user "${{ gitea.actor }}:${{ secrets.PACKET_TOKEN }}" \
             --upload-file "$f" \
             "https://git.fml128.ch/api/packages/${{ github.repository_owner }}/generic/${GITHUB_REPOSITORY#*/}/${{ steps.version.outputs.RELEASE_VERSION }}/$f"
         done
-      shell: bash
     - name: If failure delete packages
       if: failure()
       run: |
-        curl --user "${{ inputs.registry_username }}:${{ inputs.registry_password }}" \
+        curl --user "${{ gitea.actor }}:${{ secrets.PACKET_TOKEN }}" \
           -X DELETE \
           "https://git.fml128.ch/api/packages/${{ github.repository_owner }}/generic/${GITHUB_REPOSITORY#*/}/${{ steps.version.outputs.RELEASE_VERSION }}"
-      shell: bash
+

aur/action.yml

@@ -12,7 +12,7 @@ runs:
   steps:
     - name: Get aur cache key
       id: cache-aur-key
-      uses: docker://git.fml128.ch/fml128/idkyet-builder:2025.03.140102
+      uses: docker://git.fml128.ch/fml128/idkyet-builder:2025.01.211903
       with:
         args: generate_aur_cache_key ${{ inputs.layer_config_file }}
     - name: Restore aur cache
@@ -27,7 +27,7 @@ runs:
           aur-${{ github.repository }}-
     - name: Build aur
       if: steps.cache-aur-key.outputs.cache-aur-key != 'empty' && steps.cache-aur-restore.outputs.cache-hit != 'true'
-      uses: docker://git.fml128.ch/fml128/idkyet-builder:2025.03.140102
+      uses: docker://git.fml128.ch/fml128/idkyet-builder:2025.01.211903
       with:
         args: build_aur_packages ${{ inputs.layer_config_file }}
     - name: Save aur cache

builder/action.yml

@@ -10,12 +10,6 @@ inputs:
   version:
     description: 'version for release'
     required: true
-  registry_username:
-    description: 'username for registry'
-    required: true
-  registry_password:
-    description: 'password for registry'
-    required: true
   sb_db_key:
     description: 'secure_boot db key to sign efi'
     required: false
@@ -25,9 +19,6 @@ inputs:
   api_auth_token:
     description: 'api_auth_token if needed to download base images'
     required: false
-  gpg_sign_key:
-    description: 'gpg key to sign images'
-    required: false
 
 #outputs:
 #  hashes:
@@ -36,15 +27,12 @@ runs:
   using: "composite"
   steps:
     - name: Build image
-      uses: docker://git.fml128.ch/fml128/idkyet-builder:2025.03.140102
+      uses: docker://git.fml128.ch/fml128/idkyet-builder:buildah
       with:
         args: build ${{ inputs.layer_config_file }}
       env:
         INPUT_VERSION: ${{ inputs.version }}
         INPUT_OUT_DIR: ${{ inputs.out_dir }}
-        INPUT_REGISTRY_USERNAME: ${{ inputs.registry_username }}
-        INPUT_REGISTRY_PASSWORD: ${{ inputs.registry_password }}
         INPUT_SB_DB_KEY: ${{ inputs.sb_db_key }}
         INPUT_SB_DB_PEM: ${{ inputs.sb_db_pem }}
         INPUT_API_AUTH_TOKEN: ${{ inputs.api_auth_token }}
-        GPG_SIGN_KEY: ${{ inputs.gpg_sign_key }}

default.json

@@ -1,19 +0,0 @@
-{
-	"$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: (?<depName>[^:]+):(?<currentValue>[^\\s]+)"
-			],
-			"datasourceTemplate": "docker"
-		}
-	]
-}

validate/action.yml

@@ -9,6 +9,6 @@ runs:
   using: "composite"
   steps:
     - name: Validate image
-      uses: docker://git.fml128.ch/fml128/idkyet-builder:2025.03.140102
+      uses: docker://git.fml128.ch/fml128/idkyet-builder:2025.01.211903
       with:
         args: validate ${{ inputs.layer_config_file }}