aaa

Author: psaavedra

.github/actions/bitbake-build/action.yml

@@ -60,7 +60,7 @@ runs:
       run: |
         ls -lh ~/yocto-meta-wpe-image-${{ inputs.repo_release }}/builds/${{ inputs.bitbake_buildname }}/tmp/deploy/images/${{ inputs.bitbake_machine }}/
         PREFIX=${{ steps.timestamp.outputs.prefix }}
-        s3cmd put --recursive ~/yocto-meta-wpe-image-${{ inputs.repo_release }}/builds/${{ inputs.bitbake_buildname }}/tmp/deploy/images/${{ inputs.bitbake_machine }}  s3://yocto/${PREFIX}-${{ inputs.bitbake_target }}-${{ inputs.bitbake_machine }}/
+        s3cmd put --recursive ~/yocto-meta-wpe-image-${{ inputs.repo_release }}/builds/${{ inputs.bitbake_buildname }}/tmp/deploy/images/${{ inputs.bitbake_machine }}  s3://yocto/${PREFIX}-${{ inputs.bitbake_buildname }}-${{ inputs.bitbake_target }}/
     - name: Clean the tmp dir
       if: always()
       shell: bash

.github/actions/s3-configure/action.yml

@@ -15,17 +15,13 @@ runs:
   steps:
     - name: Configure s3cmd
       shell: bash
-      env:
-          S3_ACCESS_KEY: ${{ inputs.access_key }}
-          S3_SECRET_KEY: ${{ inputs.secret_key }}
-          S3_HOST_BASE: ${{ inputs.host_base }}
       run: |
         cat > ~/.s3cfg <<EOL
         [default]
-        access_key = ${S3_ACCESS_KEY}
-        secret_key = ${S3_SECRET_KEY}
-        host_base = ${S3_HOST_BASE}
-        host_bucket = %(bucket)s.${S3_HOST_BASE}
+        access_key = ${{ inputs.access_key }}
+        secret_key = ${{ inputs.secret_key }}
+        host_base = ${{ inputs.host_base }}
+        host_bucket = %(bucket)s.${{ inputs.host_base }}
         use_https = True
         gpg_command = /usr/bin/gpg
         EOL

.github/workflows/test-build.yml

@@ -6,15 +6,23 @@ jobs:
     if: "!contains(github.event.head_commit.message, 'ci skip')"
     steps:
       - name: test
+        env:
+          S3_ACCESS_KEY: ${{ secrets.S3_ACCESS_KEY }}
+          S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY }}
+          S3_HOST_BASE: ${{ secrets.S3_HOST_BASE }}
         run: |
           echo secrets.S3_HOST_BASE
-          echo ${{ secrets.S3_HOST_BASE }}
+          echo ${S3_HOST_BASE}
       - uses: actions/checkout@v3
       - uses: ./.github/actions/s3-configure
+        env:
+          S3_ACCESS_KEY: ${{ secrets.S3_ACCESS_KEY }}
+          S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY }}
+          S3_HOST_BASE: ${{ secrets.S3_HOST_BASE }}
         with:
-          access_key: ${{ secrets.S3_ACCESS_KEY }}
-          secret_key: ${{ secrets.S3_SECRET_KEY }}
-          host_base: ${{ secrets.S3_HOST_BASE }}
+          access_key: ${S3_ACCESS_KEY}
+          secret_key: ${S3_SECRET_KEY}
+          host_base: ${S3_HOST_BASE}
       - uses: ./.github/actions/bitbake-repo
         with:
           repo_release: 'scarthgap'
@@ -34,7 +42,7 @@ jobs:
       #- uses: actions/checkout@v3
       - uses: ./.github/actions/bitbake-build
         with:
-          bitbake_buildname: build-${{ matrix.machine }}
+          bitbake_buildname: wpe-${{ matrix.wpe_vers }}-${{ matrix.machine }}
           bitbake_machine: ${{ matrix.machine }}
           bitbake_source: 'poky-wayland layers.raspberrypi conf.wpe-${{ matrix.wpe_vers }} --update-config'
           repo_release: ${{ matrix.yocto_rel }}