Skip to content

Commit

Permalink
Merge branch 'heads/main' into versions-update
Browse files Browse the repository at this point in the history
* heads/main:
  Bump actions/checkout from 3 to 4 (#51)
  Remove hooks for DockerHub (#50)
  Fix build for Docker v 20.10.9 (#48)

Change-Id: I7d504c8a58e0513c6f581e808487821ea11c94ac
  • Loading branch information
madelen-at-work committed Oct 24, 2023
2 parents 64da630 + 5decf75 commit 814e564
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 9 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,20 @@ jobs:
build:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
arch: ["armv7hf", "aarch64"]
outputs:
EAP_FILE_ARMV7HF: ${{ steps.save_full_file_name.outputs.EAP_FILE_ARMV7HF }}
EAP_FILE_AARCH64: ${{ steps.save_full_file_name.outputs.EAP_FILE_AARCH64 }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Create base image metadata
id: meta
uses: ./.github/actions/metadata-action
with:
suffix: -${{ matrix.arch }}
repository: ${{ vars.REPOSITORY_DOCKER_HUB }}
repository: 'docker-compose-acap'
get_version: 'true'
- name: Update manifest file
if: ( github.ref_type == 'tag')
Expand Down Expand Up @@ -144,7 +145,7 @@ jobs:
}
# Uploads the signed eap files from artifacts to the pre-release.
# This job runs if the create_prerelease job
# This job runs if the create_prerelease job
download-and-upload-artifacts:
if: (github.ref_type == 'tag')
permissions:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down
5 changes: 0 additions & 5 deletions hooks/build

This file was deleted.

0 comments on commit 814e564

Please sign in to comment.