Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 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
8 changes: 6 additions & 2 deletions .github/actions/build-and-publish-docker/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,14 @@ runs:

- name: "Build docker image"
shell: bash
run: ./scripts/docker-release/build_docker.sh "${{ inputs.release_version }}"
run: ./scripts/docker-release/build_docker.sh "$RELEASE_VERSION"
env:
SONATYPE_FALLBACK: 1
RELEASE_VERSION: ${{ inputs.release_version }}

- name: "Push docker image"
if: ${{ inputs.dry_run == 'false' }}
shell: bash
run: ./scripts/docker-release/push_docker.sh "${{ inputs.release_version }}"
run: ./scripts/docker-release/push_docker.sh "$RELEASE_VERSION"
env:
RELEASE_VERSION: ${{ inputs.release_version }}
4 changes: 3 additions & 1 deletion .github/workflows/maven-goal-jdk/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,11 @@ runs:
- name: Set up TEST_JAVA_BINARY environment variable
shell: bash
run: |
major_version="$(echo '${{ inputs.test-java-version }}' | sed 's/\([0-9]*\).*/\1/')"
major_version="$(echo "$TEST_JAVA_VERSION" | sed 's/\([0-9]*\).*/\1/')"
java_home_var=JAVA_HOME_${major_version}_${{ runner.arch }}
echo "TEST_JAVA_BINARY=${!java_home_var}/bin/java" >> $GITHUB_ENV
env:
TEST_JAVA_VERSION: ${{ inputs.test-java-version }}

- uses: ./.github/workflows/maven-goal
with:
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/maven-goal/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,7 @@ runs:
java-version-file: .java-version
distribution: temurin
cache: 'maven'
- run: ${{ inputs.command }}
- run: "$COMMAND"
shell: ${{ inputs.shell }}
env:
COMMAND: ${{ inputs.command }}
8 changes: 6 additions & 2 deletions .github/workflows/pre-post-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,14 @@ jobs:
- name: Push the ${{ inputs.phase }} release branch
run: |
git add --all
git commit -m "${{ inputs.phase }} release: elastic-apm-agent ${{ env.RELEASE_VERSION_TAG }}"
git commit -m "$PHASE release: elastic-apm-agent ${{ env.RELEASE_VERSION_TAG }}"
git push origin ${{ env.BRANCH_NAME }}
env:
PHASE: ${{ inputs.phase }}

- name: Create the ${{ inputs.phase }} release PR
run: gh pr create --title="${{ inputs.pr_title }}" --base main --head ${{ env.BRANCH_NAME }} -b "${{ inputs.pr_body }}"
run: gh pr create --title="$PR_TITLE" --base main --head $BRANCH_NAME -b "$PR_BODY"
env:
GH_TOKEN: ${{ steps.get_token.outputs.token }}
PR_TITLE: ${{ inputs.pr_title }}
PR_BODY: ${{ inputs.pr_body }}
5 changes: 4 additions & 1 deletion .github/workflows/stash/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,11 @@ runs:
using: "composite"
steps:
- name: Create stash
run: tar -acf ${{ runner.temp }}/${{ inputs.name }}.tar.zst -C ${{ inputs.path }} ./
run: tar -acf ${{ runner.temp }}/"$ARTIFACT_NAME".tar.zst -C "$ARTIFACT_PATH" ./
shell: bash
env:
ARTIFACT_NAME: ${{ inputs.name }}
ARTIFACT_PATH: ${{ inputs.path }}

- name: Upload stash
uses: actions/upload-artifact@v4
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/unstash/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,8 @@ runs:
path: ${{ runner.temp }}

- name: Extract stash
run: tar -xf ${{ runner.temp }}/${{ inputs.name }}.tar.zst -C ${{ inputs.path }}
run: tar -xf ${{ runner.temp }}/"$ARTIFACT_NAME".tar.zst -C "$ARTIFACT_PATH"
shell: bash
env:
ARTIFACT_NAME: ${{ inputs.name }}
ARTIFACT_PATH: ${{ inputs.path }}
8 changes: 5 additions & 3 deletions .github/workflows/validate-tag/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,13 @@ runs:
id: validate-tag
shell: 'bash'
run: |
if ! [ $(echo "${{ inputs.tag }}" | grep -P "(\d{1,2})\.(\d{1,2})\.(\d{1,2})") ]; then
if ! [ $(echo "$TAG" | grep -P "(\d{1,2})\.(\d{1,2})\.(\d{1,2})") ]; then
echo "Tag should be a SemVer format"
exit 1
fi
if [ $(git tag -l "${{ inputs.tag }}") ]; then
echo "The tag ${{ inputs.tag }} already exists"
if [ $(git tag -l "$TAG") ]; then
echo "The tag $TAG already exists"
exit 1
fi
env:
TAG: ${{ inputs.tag }}
Loading