Skip to content

Commit b4f675c

Browse files
committed
fix: rpm bundling and rpm key import
1 parent a29afd8 commit b4f675c

10 files changed

Lines changed: 21 additions & 7 deletions

.ci/image/Dockerfile

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,25 @@ RUN apt-get update && \
1515
python3-venv \
1616
# tool to create msi packages
1717
wixl \
18-
# deb and rpm build tools
19-
rubygem-fpm \
18+
# install ruby and rpm which are required to install fpm package builder
2019
rpm \
20+
ruby \
21+
ruby-dev \
22+
rubygems \
2123
# create deb and rpm repository files
2224
reprepro \
2325
createrepo-c \
2426
# gcc for cross architecture compilation in arm
2527
gcc-aarch64-linux-gnu \
2628
libc6-dev-arm64-cross && \
2729
rm -rf /var/lib/apt/lists/* && \
30+
# Install fpm gem
31+
gem install fpm --no-document && \
32+
# Initialize rpm repository, SQL Lite DB
33+
mkdir -p /var/lib/rpm && \
34+
rpm --initdb && \
35+
chmod -R 777 /var/lib/rpm && \
36+
# Create work directory
2837
mkdir -p opt
2938

3039
WORKDIR /opt

.ci/scripts/component-tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
set -e -o pipefail
2+
set -e -u -o pipefail
33

44
# Fetch cloudflared from the artifacts folder
55
mv ./artifacts/cloudflared ./cloudflared

.ci/scripts/fmt-check.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
set -e -o pipefail
2+
set -e -u -o pipefail
33

44
OUTPUT=$(go run -mod=readonly golang.org/x/tools/cmd/goimports@v0.30.0 -l -d -local github.com/cloudflare/cloudflared $(go list -mod=vendor -f '{{.Dir}}' -a ./... | fgrep -v tunnelrpc))
55

.ci/scripts/github-push.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
set -e -o pipefail
2+
set -e -u -o pipefail
33

44
BRANCH="master"
55
TMP_PATH="$PWD/tmp"

.ci/scripts/linux/build-packages-fips.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/bin/bash
2+
set -e -u -o pipefail
23
VERSION=$(git describe --tags --always --match "[0-9][0-9][0-9][0-9].*.*")
34
echo $VERSION
45

.ci/scripts/linux/build-packages.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/bin/bash
2+
set -e -u -o pipefail
23

34
# Check if architecture argument is provided
45
if [ $# -eq 0 ]; then

.ci/scripts/package-windows.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
#!/bin/bash
2+
set -e -u -o pipefail
3+
24
python3 -m venv env
35
. env/bin/activate
46
pip install pynacl==1.4.0 pygithub==1.55

.ci/scripts/release-target.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
set -e -o pipefail
2+
set -e -u -o pipefail
33

44
# Check if a make target is provided as an argument
55
if [ $# -eq 0 ]; then

.ci/scripts/vuln-check.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
set -e
2+
set -e -u
33

44
# Define the file to store the list of vulnerabilities to ignore.
55
IGNORE_FILE=".vulnignore"

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,4 @@ ssh_server_tests/.env
1818
/.cover
1919
built_artifacts/
2020
component-tests/.venv
21+
/artifacts

0 commit comments

Comments
 (0)