Fixes

wodby · Jan 29, 2025 · af9b5b9 · af9b5b9
1 parent 214b1fe
commit af9b5b9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 57 deletions.
diff --git a/.github/actions/action.yml b/.github/actions/action.yml
@@ -7,6 +7,9 @@ inputs:
   latest:
     description: if tag latest
     required: false
+  workdir:
+    description: workdir
+    required: false
 runs:
   using: "composite"
   steps:
@@ -34,3 +37,4 @@ runs:
           done
         fi
       shell: bash
+      working-directory: ${{ inputs.workdir }}
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -61,6 +61,7 @@ jobs:
       - uses: ./.github/actions
         with:
           version: ${{ env.MARIADB114 }}
+          workdir: 11
           latest: true
 
   mariadb1011-build:
@@ -106,6 +107,7 @@ jobs:
       - uses: ./.github/actions
         with:
           version: ${{ env.MARIADB1011 }}
+          workdir: 10
 
   mariadb106-build:
     strategy:
@@ -150,6 +152,7 @@ jobs:
       - uses: ./.github/actions
         with:
           version: ${{ env.MARIADB106 }}
+          workdir: 10
 
   mariadb105-build:
     strategy:
@@ -194,60 +197,4 @@ jobs:
       - uses: ./.github/actions
         with:
           version: ${{ env.MARIADB105 }}
-
-#  mariadb-114:
-#    runs-on: ubuntu-latest
-#    steps:
-#    - uses: actions/checkout@v4
-#    - uses: docker/setup-qemu-action@v3
-#      with:
-#        platforms: amd64,arm64
-#    - uses: docker/setup-buildx-action@v3
-#    - uses: ./.github/actions
-#      with:
-#        version: '11.4.4'
-#        tags: '11.4,11,latest'
-#        workdir: 11
-#        platform: linux/amd64,linux/arm64
-#  mariadb-1011:
-#    runs-on: ubuntu-latest
-#    steps:
-#    - uses: actions/checkout@v4
-#    - uses: docker/setup-qemu-action@v3
-#      with:
-#        platforms: amd64,arm64
-#    - uses: docker/setup-buildx-action@v3
-#    - uses: ./.github/actions
-#      with:
-#        version: '10.11.10'
-#        tags: '10.11,10'
-#        workdir: 10
-#        platform: linux/amd64,linux/arm64
-#  mariadb-106:
-#    runs-on: ubuntu-latest
-#    steps:
-#    - uses: actions/checkout@v4
-#    - uses: docker/setup-qemu-action@v3
-#      with:
-#        platforms: amd64,arm64
-#    - uses: docker/setup-buildx-action@v3
-#    - uses: ./.github/actions
-#      with:
-#        version: '10.6.20'
-#        tags: '10.6'
-#        workdir: 10
-#        platform: linux/amd64,linux/arm64
-#  mariadb-105:
-#    runs-on: ubuntu-latest
-#    steps:
-#    - uses: actions/checkout@v4
-#    - uses: docker/[email protected]
-#      with:
-#        platforms: amd64,arm64
-#    - uses: docker/setup-buildx-action@v3
-#    - uses: ./.github/actions
-#      with:
-#        version: '10.5.27'
-#        tags: '10.5'
-#        workdir: 10
-#        platform: linux/amd64,linux/arm64
+          workdir: 10