Skip to content

Commit 7e826c8

Browse files
authored
ci: Fixes for new release workflows & gProfiler 1.2.24 (#359)
1 parent 93c8203 commit 7e826c8

File tree

4 files changed

+12
-6
lines changed

4 files changed

+12
-6
lines changed

.github/workflows/build-container-and-deploy.yml

+10-2
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,21 @@ jobs:
7676
AARCH64_IMAGE="$BASE_IMAGE-aarch64"
7777
7878
# build & push Aarch64
79-
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
80-
docker buildx create --name multiarch --driver docker-container --use --node multiarch0
8179
./scripts/build_aarch64_container.sh -t "$AARCH64_IMAGE" --push
8280
8381
push-manifest:
8482
runs-on: ubuntu-latest
83+
needs:
84+
- build-docker-x64
85+
- build-docker-aarch64
8586
steps:
87+
# needed to set up env.GH_REPO etc
88+
- name: Checkout Code
89+
uses: actions/checkout@v2
90+
with:
91+
fetch-depth: 0
92+
submodules: true
93+
8694
- name: Login to DockerHub
8795
uses: docker/login-action@v1
8896
with:

.github/workflows/build-executable-test-deploy.yml

-3
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,6 @@ jobs:
120120
121121
- name: Build gProfiler executable
122122
run: |
123-
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
124-
docker buildx create --name multiarch --driver docker-container --use --node multiarch0
125-
126123
mkdir -p output
127124
./scripts/build_aarch64_executable.sh
128125
mv build/aarch64/gprofiler output/gprofiler_aarch64

gprofiler/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
# Copyright (c) Granulate. All rights reserved.
33
# Licensed under the AGPL3 License. See LICENSE.md in the project root for license information.
44
#
5-
__version__ = "1.2.23"
5+
__version__ = "1.2.24"

scripts/setup_runner_requirements.sh

+1
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,6 @@ set -euo pipefail
88
# this file installs requirements on a blank Ubuntu server (those are typically installed
99
# on GH runners, this is used for our self-hosted runners)
1010

11+
sudo apt update
1112
sudo apt install -y docker.io python3-pip python-is-python3 build-essential
1213
sudo chmod o+rw /var/run/docker.sock

0 commit comments

Comments
 (0)