Skip to content
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
6 changes: 0 additions & 6 deletions .buildkite/scripts/dra/publish.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,6 @@ esac

info "Uploading artifacts for ${WORKFLOW_TYPE} workflow on branch: ${RELEASE_BRANCH} for version: ${STACK_VERSION} with version_qualifier: ${VERSION_QUALIFIER}"

if [ "$RELEASE_VER" != "7.17" ]; then
# Version 7.17.x doesn't generates ARM artifacts for Darwin
# TODO see if we need to do anything here
:
fi

info "Downloaded ARTIFACTS sha report"
for file in build/logstash-*; do shasum $file;done

Expand Down
2 changes: 1 addition & 1 deletion .buildkite/scripts/snyk/plugins-scan/generate-steps.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def call_url_with_retry(url: str, max_retries: int = 5, delay: int = 1) -> reque
def fetch_release_branches() -> list:
"""
Fetch release branches from artifacts-api.
Returns list of branch names (e.g., ["7.17", "8.19", "9.1", "9.2", "9.3", "main"]).
Returns list of branch names (e.g., ["8.19", "9.1", "9.2", "9.3", "main"]).
"""
global _release_branches_cache
if _release_branches_cache is not None:
Expand Down
12 changes: 0 additions & 12 deletions .buildkite/scripts/snyk/report.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,6 @@ download_auth_snyk
# clone Logstash repo, build and report
for TARGET_BRANCH in "${TARGET_BRANCHES[@]}"
do
if [ "$TARGET_BRANCH" == "7.17" ]; then
echo "Installing and configuring JDK11."
export OLD_PATH=$PATH
install_java_11
export PATH=$PWD/jdk-11.0.24+8/bin:$PATH
fi
git reset --hard HEAD # reset if any generated files appeared
# check if target branch exists
echo "Checking out $TARGET_BRANCH branch."
Expand All @@ -67,10 +61,4 @@ do
else
echo "$TARGET_BRANCH branch doesn't exist."
fi
if [ "$TARGET_BRANCH" == "7.17" ]; then
# reset state
echo "Removing JDK11 installation."
rm -rf jdk-11.0.24+8
export PATH=$OLD_PATH
fi
done
1 change: 0 additions & 1 deletion .github/workflows/bump-java-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ jobs:
- id: generator
uses: elastic/oblt-actions/elastic/active-branches@v1
with:
exclude-branches: "7.17"
filter-branches: true
bump:
permissions:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
push:
branches:
- main
- 8.*
- "8.19"
- 9.*

permissions:
Expand Down