Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Chore: Merge Staging into Prod #201

Merged
merged 30 commits into from
Jan 14, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
8832055
Added new transformer sandbox
Jayclifford345 Jan 10, 2025
3856f01
Merge branch 'staging' of https://github.com/grafana/killercoda into …
Jayclifford345 Jan 10, 2025
f518043
fixed order
Jayclifford345 Jan 10, 2025
fe256e8
fixed identation
Jayclifford345 Jan 10, 2025
f3dc440
fixed identation
Jayclifford345 Jan 10, 2025
8a4b9b2
added table
Jayclifford345 Jan 10, 2025
831eddc
Fix typos and revise note
jdbaldry Jan 10, 2025
699186b
added nano
Jayclifford345 Jan 10, 2025
1cb374b
Nitpick
jdbaldry Jan 10, 2025
935b71b
Fix casing
jdbaldry Jan 10, 2025
83157e1
Fix note styling
jdbaldry Jan 10, 2025
0b253a3
Fix Markdown spelling
jdbaldry Jan 10, 2025
53a1c0d
Pretty print JSON
jdbaldry Jan 10, 2025
1c58911
Link fix and add link to fork the repository
jdbaldry Jan 10, 2025
4566a68
Fix double copy-paste
jdbaldry Jan 10, 2025
6009c18
Merge pull request #197 from grafana/jdbaldry-patch-1
Jayclifford345 Jan 10, 2025
8ec565c
Implement table extension
jdbaldry Jan 10, 2025
29c8416
added release workflow
Jayclifford345 Jan 13, 2025
7c4ce68
Merge branch 'staging' of https://github.com/grafana/killercoda into …
Jayclifford345 Jan 13, 2025
6883456
Merge pull request #199 from grafana/jdb/2025-01-fix-table-transforma…
Jayclifford345 Jan 13, 2025
bdcfd4b
fixed build workflow
Jayclifford345 Jan 13, 2025
5758f59
fixed release directory
Jayclifford345 Jan 13, 2025
233077d
fixed release location
Jayclifford345 Jan 13, 2025
e5f5108
removed zip
Jayclifford345 Jan 13, 2025
6e4c988
fixed nesting folders
Jayclifford345 Jan 13, 2025
4257e8d
updated build version
Jayclifford345 Jan 14, 2025
a76ccc3
Harden workflows
jdbaldry Jan 14, 2025
5fd62f4
added table back and removed go build instruct
Jayclifford345 Jan 14, 2025
235dc6c
fixed pathing
Jayclifford345 Jan 14, 2025
f51c9fa
Merge pull request #200 from grafana/jdb/2025-01-harden-workflows
Jayclifford345 Jan 14, 2025
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
5 changes: 3 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ jobs:
if: github.repository == 'grafana/killercoda'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
path: killercoda
- uses: actions/setup-go@v5
persist-credentials: false
- uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
with:
go-version-file: killercoda/tools/transformer/go.mod
- run: go test ./...
Expand Down
43 changes: 25 additions & 18 deletions .github/workflows/regenerate-tutorials.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,34 +9,41 @@ jobs:
runs-on: ubuntu-latest
steps:
# Check out all the repositories that contain documentation sources from which we generate tutorials.
- uses: actions/checkout@v4
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
repository: grafana/loki
path: loki
- uses: actions/checkout@v4
persist-credentials: false
repository: grafana/loki
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
repository: grafana/grafana
path: grafana
- uses: actions/checkout@v4
persist-credentials: false
repository: grafana/grafana
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
repository: grafana/alloy
path: alloy
- uses: actions/checkout@v4
path: alloy
persist-credentials: false
repository: grafana/alloy
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
repository: grafana/tempo
path: tempo
- uses: actions/checkout@v4
path: tempo
persist-credentials: false
repository: grafana/tempo
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
repository: grafana/mimir
path: mimir
- uses: actions/checkout@v4
path: mimir
persist-credentials: false
repository: grafana/mimir
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
repository: grafana/pyroscope
path: pyroscope
- uses: actions/checkout@v4
path: pyroscope
persist-credentials: false
repository: grafana/pyroscope
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
path: killercoda
- uses: actions/setup-go@v5
persist-credentials: false
- uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
with:
go-version-file: killercoda/tools/transformer/go.mod
- run: go build ./
Expand Down
52 changes: 52 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
name: Build and Release Transformer

on:
push:
tags:
- 'v*' # Trigger the workflow when a tag matching 'v*' is pushed
workflow_dispatch: # Allows manual triggering

jobs:
build-and-release:
runs-on: ubuntu-latest
strategy:
matrix:
os: [linux, darwin, windows] # Target operating systems
arch: [amd64, arm64] # Target architectures
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
persist-credentials: false

- uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
with:
cache: false
go-version-file: killercoda/tools/transformer/go.mod

- name: Build transformer
working-directory: ./tools/transformer
run: |
mkdir -p ../../release
GOOS=${{ matrix.os }} GOARCH=${{ matrix.arch }} go build -o ../../release/transformer-${{ matrix.os }}-${{ matrix.arch }}

- name: Upload artifact
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
with:
name: transformer-${{ matrix.os }}-${{ matrix.arch }}
path: release/transformer-${{ matrix.os }}-${{ matrix.arch }}

release:
needs: build-and-release
runs-on: ubuntu-latest
steps:
- name: Download build artifacts
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
with:
path: release

- name: Create GitHub Release
uses: softprops/action-gh-release@c95fe1489396fe8a9eb87c0abf8aa5b2ef267fda # v2.2.1
with:
files: release/**
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Loading
Loading