apitech
/
grafana
mirror of https://github.com/grafana/grafana
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

CI: Fix calling 'move_packages' in wrong directory (#105912)

Browse Source 
move_packages is in pkg now
pull/105913/head
Kevin Minehart 2 months ago committed by GitHub
parent 5cee301e75
commit 0a49849cb3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 7 additions and 7 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      pkg/build/daggerbuild/scripts/drone_build_main.sh
  2. 2
      pkg/build/daggerbuild/scripts/drone_build_main_enterprise.sh
  3. 4
      pkg/build/daggerbuild/scripts/drone_build_main_pro.sh
  4. 2
      pkg/build/daggerbuild/scripts/drone_build_tag_enterprise.sh
  5. 2
      pkg/build/daggerbuild/scripts/drone_build_tag_grafana.sh
  6. 2
      pkg/build/daggerbuild/scripts/drone_build_tag_pro.sh

2
pkg/build/daggerbuild/scripts/drone_build_main.sh
Unescape View File

@ -35,4 +35,4 @@ echo "Final list of artifacts:"
cat assets.txt cat assets.txt
# Move the tar.gz packages to their expected locations # Move the tar.gz packages to their expected locations
cat assets.txt | IS_MAIN=true go run ./scripts/move_packages.go ./dist/main cat assets.txt | IS_MAIN=true go run ./pkg/build/daggerbuild/scripts/move_packages.go ./dist/main

2
pkg/build/daggerbuild/scripts/drone_build_main_enterprise.sh
Unescape View File

@ -33,4 +33,4 @@ dagger run --silent go run ./pkg/build/cmd \
cat assets.txt cat assets.txt
# Move the tar.gz packages to their expected locations # Move the tar.gz packages to their expected locations
cat assets.txt | DESTINATION=gs://grafana-downloads IS_MAIN=true go run ./scripts/move_packages.go ./dist/main cat assets.txt | DESTINATION=gs://grafana-downloads IS_MAIN=true go run ./pkg/build/daggerbuild/scripts/move_packages.go ./dist/main

4
pkg/build/daggerbuild/scripts/drone_build_main_pro.sh
Unescape View File

@ -28,5 +28,5 @@ dagger run --silent go run ./pkg/build/cmd \
echo "Final list of artifacts:" echo "Final list of artifacts:"
# Move the tar.gz packages to their expected locations # Move the tar.gz packages to their expected locations
cat assets.txt | grep -v "public" | DESTINATION=gs://grafana-downloads-enterprise2 IS_MAIN=true go run ./scripts/move_packages.go ./dist/main cat assets.txt | grep -v "public" | DESTINATION=gs://grafana-downloads-enterprise2 IS_MAIN=true go run ./pkg/build/daggerbuild/scripts/move_packages.go ./dist/main
cat assets.txt | grep "public" | DESTINATION=gs://grafana-static-assets IS_MAIN=true go run ./scripts/move_packages.go ./dist/cdn cat assets.txt | grep "public" | DESTINATION=gs://grafana-static-assets IS_MAIN=true go run ./pkg/build/daggerbuild/scripts/move_packages.go ./dist/cdn

2
pkg/build/daggerbuild/scripts/drone_build_tag_enterprise.sh
Unescape View File

@ -48,4 +48,4 @@ dagger run --silent go run ./pkg/build/cmd \
--destination=${local_dst} > assets.txt --destination=${local_dst} > assets.txt
# Move the tar.gz packages to their expected locations # Move the tar.gz packages to their expected locations
cat assets.txt | go run ./scripts/move_packages.go ./dist/prerelease cat assets.txt | go run ./pkg/build/daggerbuild/scripts/move_packages.go ./dist/prerelease

2
pkg/build/daggerbuild/scripts/drone_build_tag_grafana.sh
Unescape View File

@ -44,4 +44,4 @@ dagger run --silent go run ./pkg/build/cmd \
--version=${DRONE_TAG} \ --version=${DRONE_TAG} \
--destination=${local_dst} > assets.txt --destination=${local_dst} > assets.txt
cat assets.txt | go run ./scripts/move_packages.go ./dist/prerelease cat assets.txt | go run ./pkg/build/daggerbuild/scripts/move_packages.go ./dist/prerelease

2
pkg/build/daggerbuild/scripts/drone_build_tag_pro.sh
Unescape View File

@ -38,4 +38,4 @@ dagger run --silent go run ./pkg/build/cmd \
--destination=${local_dst} > assets.txt --destination=${local_dst} > assets.txt
# Move the tar.gz packages to their expected locations # Move the tar.gz packages to their expected locations
cat assets.txt | go run ./scripts/move_packages.go ./dist/prerelease cat assets.txt | go run ./pkg/build/daggerbuild/scripts/move_packages.go ./dist/prerelease

Write Preview
Loading…
Cancel
Save