From b8e258d435f8752bf5a44d24003fef9a3aa2c766 Mon Sep 17 00:00:00 2001 From: Tolya Korniltsev Date: Fri, 22 Nov 2024 16:19:49 +0700 Subject: [PATCH] fix: drop drone. fix artifact names in release workflow --- .drone/drone.jsonnet | 3 --- .drone/drone.yml | 37 --------------------------------- .drone/pipelines/test.jsonnet | 32 ---------------------------- .drone/util/build_image.jsonnet | 6 ------ .drone/util/pipelines.jsonnet | 20 ------------------ .drone/util/secrets.jsonnet | 23 -------------------- .github/workflows/release.yml | 16 +++++++------- 7 files changed, 8 insertions(+), 129 deletions(-) delete mode 100644 .drone/drone.jsonnet delete mode 100644 .drone/drone.yml delete mode 100644 .drone/pipelines/test.jsonnet delete mode 100644 .drone/util/build_image.jsonnet delete mode 100644 .drone/util/pipelines.jsonnet delete mode 100644 .drone/util/secrets.jsonnet diff --git a/.drone/drone.jsonnet b/.drone/drone.jsonnet deleted file mode 100644 index b250485..0000000 --- a/.drone/drone.jsonnet +++ /dev/null @@ -1,3 +0,0 @@ -local pipelines = import './pipelines.jsonnet'; - -(import 'pipelines/test.jsonnet') diff --git a/.drone/drone.yml b/.drone/drone.yml deleted file mode 100644 index c570b71..0000000 --- a/.drone/drone.yml +++ /dev/null @@ -1,37 +0,0 @@ ---- -kind: pipeline -name: '[amd64] make test' -platform: - arch: amd64 - os: linux -steps: -- commands: - - uname -a - - make test - image: pyroscope/rust_builder_cli:3 - name: make cli/test -trigger: - event: - - pull_request -type: docker ---- -kind: pipeline -name: '[arm64] make test' -platform: - arch: arm64 - os: linux -steps: -- commands: - - uname -a - - make test - image: pyroscope/rust_builder_cli:3 - name: make cli/test -trigger: - event: - - pull_request -type: docker ---- -kind: signature -hmac: ae54e4e9f852f94f3f7cd411812430ea96ad7238f1f638753161305d554e55fa - -... diff --git a/.drone/pipelines/test.jsonnet b/.drone/pipelines/test.jsonnet deleted file mode 100644 index 1012294..0000000 --- a/.drone/pipelines/test.jsonnet +++ /dev/null @@ -1,32 +0,0 @@ -local build_image = import '../util/build_image.jsonnet'; -local pipelines = import '../util/pipelines.jsonnet'; - -[ - // todo add macos builds - pipelines.linux_amd64('[amd64] make test') { - trigger: { - event: ['pull_request'], - //ref: ['refs/heads/main'], - }, - steps: [ - { - name: 'make cli/test', - image: build_image.linux, - commands: ['uname -a', 'make test'], - }, - ], - }, - pipelines.linux_arm64('[arm64] make test') { - trigger: { - event: ['pull_request'], - //ref: ['refs/heads/main'], - }, - steps: [ - { - name: 'make cli/test', - image: build_image.linux, - commands: ['uname -a', 'make test'], - }, - ], - }, -] diff --git a/.drone/util/build_image.jsonnet b/.drone/util/build_image.jsonnet deleted file mode 100644 index c0b4305..0000000 --- a/.drone/util/build_image.jsonnet +++ /dev/null @@ -1,6 +0,0 @@ -{ - local version = std.extVar('BUILD_IMAGE_VERSION'), - - linux: 'pyroscope/rust_builder_cli:%s' % version, - -} diff --git a/.drone/util/pipelines.jsonnet b/.drone/util/pipelines.jsonnet deleted file mode 100644 index f387a95..0000000 --- a/.drone/util/pipelines.jsonnet +++ /dev/null @@ -1,20 +0,0 @@ -{ - linux_amd64(name):: { - kind: 'pipeline', - type: 'docker', - name: name, - platform: { - os: 'linux', - arch: 'amd64', - }, - }, - linux_arm64(name):: { - kind: 'pipeline', - type: 'docker', - name: name, - platform: { - os: 'linux', - arch: 'arm64', - }, - }, -} diff --git a/.drone/util/secrets.jsonnet b/.drone/util/secrets.jsonnet deleted file mode 100644 index b3d4030..0000000 --- a/.drone/util/secrets.jsonnet +++ /dev/null @@ -1,23 +0,0 @@ -local newSecret(name) = { - kind: 'secret', - name: name, - - getFrom(path, name):: self { - get: { path: path, name: name }, - }, - - fromSecret:: local secret = self; { from_secret: secret.name }, -}; - -{ - dockerconfigjson: newSecret('dockerconfigjson').getFrom(path='secret/data/common/gcr', name='.dockerconfigjson'), - gcr_admin: newSecret('gcr_admin').getFrom(path='infra/data/ci/gcr-admin', name='.dockerconfigjson'), - gh_token: newSecret('gh_token').getFrom(path='infra/data/ci/github/grafanabot', name='pat'), - gpg_public_key: newSecret('gpg_public_key').getFrom(path='infra/data/ci/packages-publish/gpg', name='public-key'), - gpg_private_key: newSecret('gpg_private_key').getFrom(path='infra/data/ci/packages-publish/gpg', name='private-key'), - gpg_passphrase: newSecret('gpg_passphrase').getFrom(path='infra/data/ci/packages-publish/gpg', name='passphrase'), - docker_login: newSecret('docker_login').getFrom(path='infra/data/ci/docker_hub', name='username'), - docker_password: newSecret('docker_password').getFrom(path='infra/data/ci/docker_hub', name='password'), - - asList:: [self[k] for k in std.sort(std.objectFields(self))], -} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d61e504..99025bc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -132,7 +132,7 @@ jobs: - run: make wheel/linux/amd64 - uses: actions/upload-artifact@v4 with: - name: ${{ github.sha }} + name: ${{ github.sha }}-python-amd64 path: pyroscope_ffi/python/dist/* - name: Upload release artifact @@ -152,7 +152,7 @@ jobs: - run: make wheel/linux/arm64 - uses: actions/upload-artifact@v4 with: - name: ${{ github.sha }} + name: ${{ github.sha }}-python-arm64 path: pyroscope_ffi/python/dist/* - name: Upload release artifact @@ -194,7 +194,7 @@ jobs: - uses: actions/upload-artifact@v4 with: - name: ${{ github.sha }} + name: ${{ github.sha }}-python-macos-${{ matrix.target }} path: pyroscope_ffi/python/dist/* - name: Upload release artifact @@ -225,7 +225,7 @@ jobs: - uses: actions/upload-artifact@v4 with: - name: ${{ github.sha }} + name: ${{ github.sha }}-python-sdist path: pyroscope_ffi/python/dist/* - name: Upload release artifact @@ -261,7 +261,7 @@ jobs: - run: make gem/linux/amd64 - uses: actions/upload-artifact@v4 with: - name: ${{ github.sha }} + name: ${{ github.sha }}-ruby-amd64 path: pyroscope_ffi/ruby/pkg/*.gem - name: Upload release artifact @@ -281,7 +281,7 @@ jobs: - run: make gem/linux/arm64 - uses: actions/upload-artifact@v4 with: - name: ${{ github.sha }} + name: ${{ github.sha }}-ruby-arm64 path: pyroscope_ffi/ruby/pkg/*.gem - name: Upload release artifact @@ -322,7 +322,7 @@ jobs: - uses: actions/upload-artifact@v4 with: - name: ${{ github.sha }} + name: ${{ github.sha }}-ruby-mac-${{ matrix.target }} path: pyroscope_ffi/ruby/pkg/*.gem - name: Upload release artifact @@ -356,7 +356,7 @@ jobs: - uses: actions/upload-artifact@v4 with: - name: ${{ github.sha }} + name: ${{ github.sha }}-ruby-source path: pyroscope_ffi/ruby/pkg/*.gem - name: Upload release artifact