Skip to content

Commit 4654494

Browse files
workflows: resolve failures in staging build (fluent#4449)
* workflows: resolve failures in staging build Signed-off-by: Patrick Stephens <[email protected]> * workflows: fix link in README.md Signed-off-by: Patrick Stephens <[email protected]>
1 parent 45e865f commit 4654494

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

.github/workflows/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
| Workflow file | Description | Run event |
44
| :---------------------------------------------------- | ------------------------ | ------------------------------------------------- |
55
| [staging-build](./staging-build.yaml) | Builds the distro packages and docker images from a tagged release into staging (S3 and GHCR) | on new release/tag |
6-
| [staging-test](./staging-build.yaml) | Test the staging distro packages and docker images| manually or when `staging-build` completes successfully |
6+
| [staging-test](./staging-test.yaml) | Test the staging distro packages and docker images| manually or when `staging-build` completes successfully |
77
| [staging-release](./staging-release.yaml) | Publishes the docker images/manifest on hub.docker.io/fluent/ and the distro packages | manual approval |
88
| [pr-closed-docker](./pr-closed-docker.yaml) | Removes docker images for PR on hub.docker.io/fluentbitdev/| on pr closed|
99
| [pr-compile-check](./pr-compile-check.yaml) | Runs some compilation sanity checks on a PR |

.github/workflows/call-build-packages.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,9 @@ jobs:
137137
release: ${{ needs.deploy-get-version.outputs.releaseTag }}
138138
steps:
139139
- name: Install dependencies
140-
run: sudo apt-get install createrepo debsigs apt-utils
140+
run: |
141+
sudo apt-get update
142+
sudo apt-get install -y createrepo debsigs apt-utils
141143
142144
- name: Checkout code
143145
uses: actions/checkout@v2

packaging/update-repos.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ for RPM_REPO in "${RPM_REPO_PATHS[@]}"; do
2222
createrepo -dvp "$REPO_DIR"
2323

2424
# Set up repo info
25-
if [[ -n "${AWS_S3_BUCKET}" ]]; then
25+
if [[ -n "${AWS_S3_BUCKET:-}" ]]; then
2626
REPO_TYPE=${RPM_REPO%%/*}
2727
echo "Setting up $BASE_PATH/$REPO_TYPE.repo"
2828
cat << EOF > "$BASE_PATH/$REPO_TYPE.repo"
@@ -61,9 +61,9 @@ for DEB_REPO in "${DEB_REPO_PATHS[@]}"; do
6161
mkdir -p "$REPO_DIR/pool/main/t/td-agent-bit"
6262
mkdir -p "$REPO_DIR/pool/main/t/td-agent-bit-headers"
6363
mkdir -p "$REPO_DIR/pool/main/t/td-agent-bit-headers-extra"
64-
mv $REPO_DIR/td-agent-bit*-headers-extra.deb "$REPO_DIR/pool/main/t/td-agent-bit-headers-extra/"
65-
mv $REPO_DIR/td-agent-bit*-headers.deb "$REPO_DIR/pool/main/t/td-agent-bit-heaers/"
66-
mv $REPO_DIR/td-agent-bit*.deb "$REPO_DIR/pool/main/t/td-agent-bit/"
64+
mv "$REPO_DIR"/td-agent-bit*-headers-extra.deb "$REPO_DIR/pool/main/t/td-agent-bit-headers-extra/"
65+
mv "$REPO_DIR"/td-agent-bit*-headers.deb "$REPO_DIR/pool/main/t/td-agent-bit-headers/"
66+
mv "$REPO_DIR"/td-agent-bit*.deb "$REPO_DIR/pool/main/t/td-agent-bit/"
6767

6868
# All paths must be relative and using `dists/CODENAME` for the package info
6969
pushd "$REPO_DIR"

0 commit comments

Comments
 (0)