Skip to content

Commit 0759726

Browse files
authored
Make minor updates to the packages workflow (#659)
The purpose of this change was originally to update the go dependency in our Azure Linux builds, but that fix went into d1400a7 to unblock the build. What's left are a few minor changes that needed to be made, specifically using more appropriate runner images and an updated GitHub Action in the packages workflow.
1 parent d1400a7 commit 0759726

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

.github/workflows/packages.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,10 @@ jobs:
9393
runner:
9494
- arch: amd64
9595
pool: iot-identity-1es-hosted-linux-amd64
96-
image: agent-aziotedge-ubuntu-22.04-msmoby
96+
image: agent-aziotedge-ubuntu-22.04
9797
- arch: aarch64
9898
pool: iot-identity-1es-hosted-linux-arm64
99-
image: agent-aziotedge-ubuntu-22.04-arm64-msmoby
99+
image: agent-aziotedge-ubuntu-22.04-arm64
100100

101101
runs-on:
102102
- self-hosted
@@ -115,7 +115,7 @@ jobs:
115115
sudo chown $(id -u):$(id -g) /run/user/$(id -u)
116116
117117
- name: 'Run'
118-
uses: 'snapcore/action-build@v1'
118+
uses: 'canonical/action-build@v1'
119119
id: 'snapcraft'
120120
with:
121121
build-info: true

ci/install-build-deps.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,12 +210,10 @@ if [ -z "${DISABLE_FOR_CODEQL:-}" ]; then
210210

211211
apt-get update
212212
apt-get upgrade -y
213-
214213
apt-get install -y \
215214
acl cmake cpio curl g++ gcc genisoimage git jq libclang1 libssl-dev llvm-dev make \
216215
pigz pkg-config python3-distutils python3-pip qemu-utils rpm tar wget zstd
217216

218-
# Install Go 1.23
219217
GO_VERSION=1.23.0
220218
[ "$ARCH" == 'aarch64' ] && GO_ARCH='arm64' || GO_ARCH='amd64'
221219
mkdir -p /usr/local/go

0 commit comments

Comments
 (0)