Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: handle single arch builds more good #11462

Merged
merged 2 commits into from
Jan 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions .github/workflows/ci-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -177,11 +177,12 @@ jobs:
run: |
cd /tmp/artifacts-1

# Put the packages into one place
mv /tmp/artifacts-2/packages/* ./packages/

# Merge the build log ("packages.log") files
cat /tmp/artifacts-2/packages.log >> ./packages.log
# Put the packages into one place (if aarch64 logs exist)
if test -f "/tmp/artifacts-2/packages"; then
mv /tmp/artifacts-2/packages/* ./packages/
# Merge the build log ("packages.log") files
cat /tmp/artifacts-2/packages.log >> ./packages.log
fi

- name: Soname check
run: |
Expand Down Expand Up @@ -215,11 +216,12 @@ jobs:
run: |
cd /tmp/artifacts-1

# Put the packages into one place
mv /tmp/artifacts-2/packages/* ./packages/

# Merge the build log ("packages.log") files
cat /tmp/artifacts-2/packages.log >> ./packages.log
# Put the packages into one place (if aarch64 logs exist)
if test -f "/tmp/artifacts-2/packages"; then
mv /tmp/artifacts-2/packages/* ./packages/
# Merge the build log ("packages.log") files
cat /tmp/artifacts-2/packages.log >> ./packages.log
fi

- name: 'Retrieve Wolfi advisory data'
uses: actions/checkout@v4
Expand Down
3 changes: 0 additions & 3 deletions calico.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@ package:
version: 3.27.0
epoch: 0
description: "Cloud native networking and network security"
target-architecture:
- x86_64
- aarch64
copyright:
- license: Apache-2.0
checks:
Expand Down
2 changes: 0 additions & 2 deletions certificate-transparency.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ package:
version: 1.1.7
epoch: 2
description: Auditing for TLS certificates
target-architecture:
- all
copyright:
- license: Apache-2.0
paths:
Expand Down
2 changes: 0 additions & 2 deletions dotnet-6.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ package:
version: 6.0.126
epoch: 0
description: ".NET SDK, version 6"
target-architecture:
- all
copyright:
- license: MIT
dependencies:
Expand Down
3 changes: 0 additions & 3 deletions kube-rbac-proxy.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
package:
name: kube-rbac-proxy
version: 0.15.0
target-architecture:
- x86_64
- aarch64
epoch: 1
description: Kubernetes RBAC authorizing HTTP proxy for a single upstream.
copyright:
Expand Down
2 changes: 0 additions & 2 deletions libdaemon.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ package:
version: 0.14
epoch: 0
description: A lightweight C library which eases the writing of UNIX daemons
target-architecture:
- all
copyright:
- license: LGPL-2.1-or-later

Expand Down
2 changes: 0 additions & 2 deletions newrelic-prometheus-configurator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ package:
version: 1.12.0
epoch: 0
description: New Relic Prometheus Configurator
target-architecture:
- all
copyright:
- license: Apache-2.0

Expand Down
2 changes: 0 additions & 2 deletions opensearch-2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ package:
version: 2.11.1
epoch: 2 # Remove CVE-2022-45146 patch when bumping to 2.12 or later
description:
target-architecture:
- all
copyright:
- paths:
- "*"
Expand Down
2 changes: 0 additions & 2 deletions rekor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ package:
version: 1.3.4
epoch: 2
description: Software Supply Chain Transparency Log
target-architecture:
- all
copyright:
- license: Apache-2.0
checks:
Expand Down
2 changes: 0 additions & 2 deletions task.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ package:
version: 3.33.1
epoch: 0
description: A task runner / simpler Make alternative written in Go
target-architecture:
- all
copyright:
- license: MIT
paths:
Expand Down
2 changes: 0 additions & 2 deletions timestamp-authority.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ package:
version: 1.2.1
epoch: 0
description: RFC3161 Timestamp Authority
target-architecture:
- all
copyright:
- license: Apache-2.0
paths:
Expand Down
Loading