Skip to content

Commit

Permalink
Merge branch 'develop' into fix/ADDON-69999-deprecate-preserve-infra
Browse files Browse the repository at this point in the history
  • Loading branch information
mbruzda-splunk authored May 14, 2024
2 parents abcfd43 + 58b5db8 commit 5a3ab72
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 47 deletions.
41 changes: 4 additions & 37 deletions .github/workflows/reusable-build-test-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ on:
required: false
description: "branch for k8s manifests to run the tests on"
type: string
default: "main"
default: "v1.0.0"
secrets:
GH_TOKEN_ADMIN:
description: Github admin token
Expand Down Expand Up @@ -170,13 +170,6 @@ jobs:
meta:
runs-on: ubuntu-latest
outputs:
sc4s: ghcr.io/${{ github.repository }}/container:${{ fromJSON(steps.docker_action_meta.outputs.json).labels['org.opencontainers.image.version'] }}
container_tags: ${{ steps.docker_action_meta.outputs.tags }}
container_labels: ${{ steps.docker_action_meta.outputs.labels }}
container_buildtime: ${{ fromJSON(steps.docker_action_meta.outputs.json).labels['org.opencontainers.image.created'] }}
container_version: ${{ fromJSON(steps.docker_action_meta.outputs.json).labels['org.opencontainers.image.version'] }}
container_revision: ${{ fromJSON(steps.docker_action_meta.outputs.json).labels['org.opencontainers.image.revision'] }}
container_base: ${{ fromJSON(steps.docker_action_meta.outputs.json).tags[0] }}
matrix_latestSplunk: ${{ steps.matrix.outputs.latestSplunk }}
matrix_supportedSC4S: ${{ steps.matrix.outputs.supportedSC4S }}
matrix_combinedSplunkversion: ${{ steps.combined_Splunkmatrix.outputs.combinedSplunkversions }}
Expand All @@ -186,37 +179,11 @@ jobs:
contents: write
packages: read
steps:
- name: Checkout
uses: actions/checkout@v3
- uses: actions/checkout@v3
with:
submodules: false
persist-credentials: false
- name: Semantic Release
id: version
uses: splunk/[email protected]
with:
dry_run: true
git_committer_name: ${{ secrets.SA_GH_USER_NAME }}
git_committer_email: ${{ secrets.SA_GH_USER_EMAIL }}
gpg_private_key: ${{ secrets.SA_GPG_PRIVATE_KEY }}
passphrase: ${{ secrets.SA_GPG_PASSPHRASE }}
env:
GITHUB_TOKEN: ${{ github.token }}
- name: Docker meta
id: docker_action_meta
uses: docker/[email protected]
with:
images: ghcr.io/${{ github.repository }}/container
tags: |
type=sha,format=long
type=sha
type=semver,pattern={{version}},value=${{ steps.version.outputs.new_release_version }}
type=semver,pattern={{major}},value=${{ steps.version.outputs.new_release_version }}
type=semver,pattern={{major}}.{{minor}},value=${{ steps.version.outputs.new_release_version }}
type=ref,event=branch
type=ref,event=pr
- name: matrix
id: matrix
- id: matrix
uses: splunk/[email protected]
- name: Combined Splunk and SC4S Versions
id: combined_Splunkmatrix
Expand Down Expand Up @@ -772,7 +739,7 @@ jobs:
name: package-splunkbase
path: build/package/
- name: Scan
uses: splunk/appinspect-cli-action@v2.6
uses: splunk/appinspect-cli-action@v2.7
with:
app_path: build/package/
included_tags: ${{ matrix.tags }}
Expand Down
11 changes: 1 addition & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,16 +52,7 @@ meta stage

**Description:**

- GitHub Action to extract metadata from Git reference and GitHub events.

**Action used:** https://github.com/docker/metadata-action

**Artifacts:**

- No Artifacts for this stage.

<img src="images/meta/meta_logs.png" alt="meta_logs" style="width:200px;"/>

- Determines which Splunk and SC4S versions to run tests with.

fossa-scan
=======================
Expand Down
Binary file removed images/meta/meta_logs.png
Binary file not shown.

0 comments on commit 5a3ab72

Please sign in to comment.