Skip to content

Commit

Permalink
chore: post merge fixes (#1924)
Browse files Browse the repository at this point in the history
  • Loading branch information
schoren committed Feb 1, 2023
1 parent e3db7c2 commit 3fee1e0
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 18 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/deploy-main.yml
Expand Up @@ -70,7 +70,7 @@ jobs:
cache-dependency-path: go.work
- shell: bash
run: |
echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
echo "sha_short=$(git rev-parse --short $GITHUB_SHA)" >> $GITHUB_ENV
- id: cache
uses: actions/cache@v3
with:
Expand Down Expand Up @@ -121,10 +121,9 @@ jobs:
cache: true
cache-dependency-path: go.work

# copy the cashes from prepare
- shell: bash
run: |
echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
echo "sha_short=$(git rev-parse --short $GITHUB_SHA)" >> $GITHUB_ENV
- uses: actions/cache@v3
with:
path: dist/linux
Expand All @@ -142,7 +141,6 @@ jobs:
name: tracetest-web
path: web/build/

# release
- uses: goreleaser/goreleaser-action@v4
if: steps.cache.outputs.cache-hit != 'true'
with:
Expand Down
18 changes: 6 additions & 12 deletions .github/workflows/pull-request.yaml
Expand Up @@ -264,22 +264,16 @@ jobs:
- name: Setup GoReleaser
uses: goreleaser/goreleaser-action@v4
with:
# uncomment this once this pr is merged
# distribution: goreleaser-pro
distribution: goreleaser-pro
version: v1.15.0
install-only: true
- name: Install CLI intergation version (latest main)
run: |
git clone --depth 1 https://github.com/kubeshop/tracetest /tmp/tracetest-main
cd /tmp/tracetest-main/cli
make build
mv dist ..
# change to this once this pr is merged
# cd /tmp/tracetest-main/
# make build-go
# find ./dist -name 'tracetest' -exec cp {} ./dist \;
# chmod +x ./dist/tracetest
git clone --depth 1 https://github.com/kubeshop/tracetest /tmp/tracetest-main/
cd /tmp/tracetest-main/
goreleaser build --single-target --clean --snapshot
find ./dist -name 'tracetest' -exec cp {} ./dist \;
chmod +x ./dist/tracetest
- name: Forward port
run: |
kubectl port-forward \
Expand Down
2 changes: 0 additions & 2 deletions .goreleaser.yaml
Expand Up @@ -71,8 +71,6 @@ snapshot:
nightly:
publish_release: true
keep_single_release: true
name_template: 'latest'
tag_name: latest

dockers:
- image_templates:
Expand Down

0 comments on commit 3fee1e0

Please sign in to comment.