fix: action issues

ralgar · Apr 13, 2024 · 4957cc9 · 4957cc9
1 parent 86030db
commit 4957cc9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/.github/actions/kolla-build/action.yml b/.github/actions/kolla-build/action.yml
@@ -1,10 +1,13 @@
 ---
-name: "Kolla Build"
+name: Kolla Build
 description: "Installs, configures, and runs Kolla Build."
 
 inputs:
   component:
-    description: "Name of the component to build"
+    description: "Name of the component to build."
+    required: true
+  ghcr_token:
+    description: "Token for accessing GitHub Container Registry."
     required: true
 
 runs:
@@ -29,10 +32,11 @@ runs:
       with:
         registry: ghcr.io
         username: ${{ github.actor }}
-        password: ${{ secrets.GITHUB_TOKEN }}
+        password: ${{ inputs.ghcr_token }}
 
     - name: Build and push containers
       run: >
         kolla-build
         --config-file ${{ inputs.component }}/build.conf
         --template-override ${{ inputs.component }}/override.j2
+      shell: bash
diff --git a/.github/workflows/magnum.yml b/.github/workflows/magnum.yml
@@ -4,11 +4,11 @@ name: Build Magnum
 on:
   push:
     paths:
-      - '.github/actions/setup-kolla/**'
+      - '.github/actions/kolla-build/**'
       - 'magnum/**'
 
 env:
-  COMPONENT: "magnum"
+  COMPONENT: magnum
 
 jobs:
   kolla-build:
@@ -17,7 +17,8 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Setup Kolla
+      - name: Kolla Build
         uses: ./.github/actions/kolla-build
         with:
           component: ${{ env.COMPONENT }}
+          ghcr_token: ${{ secrets.GITHUB_TOKEN }}