Skip to content

Commit a9912e9

Browse files
committed
[IDE-1660] Attempt to fix goreleaser-cross
1 parent 398409c commit a9912e9

File tree

3 files changed

+8
-10
lines changed

3 files changed

+8
-10
lines changed

.github/actions/publish/action.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,21 +40,15 @@ runs:
4040
# We're using the goreleaser-cross image to facilitate this. See also: https://github.com/goreleaser/goreleaser-cross
4141
shell: bash
4242
run: |
43-
set -x
43+
docker login --username $DOCKER_HUB_USERNAME --password $DOCKER_HUB_TOKEN
4444
CONTAINER_ID="$(
4545
docker run --detach \
4646
--volume "$PWD:$PWD" \
4747
--volume /var/run/docker.sock:/var/run/docker.sock \
4848
--entrypoint tail \
49-
ghcr.io/goreleaser/goreleaser-cross:latest \
49+
ghcr.io/launchdarkly/goreleaser-cross:v1.24.2-pr-23 \
5050
-f /dev/null
5151
)"
52-
docker exec --tty "$CONTAINER_ID" mkdir -p /musl
53-
docker exec --tty "$CONTAINER_ID" bash -euo pipefail -c 'curl --retry 5 --retry-all-errors --retry-delay 5 -fsSL https://musl.cc/aarch64-linux-musl-cross.tgz -o- | tar -zxvf - -C /musl --strip-components=1'
54-
docker exec --tty "$CONTAINER_ID" bash -euo pipefail -c 'curl --retry 5 --retry-all-errors --retry-delay 5 -fsSL https://musl.cc/i686-linux-musl-cross.tgz -o- | tar -zxvf - -C /musl --strip-components=1'
55-
docker exec --tty "$CONTAINER_ID" bash -euo pipefail -c 'curl --retry 5 --retry-all-errors --retry-delay 5 -fsSL https://musl.cc/x86_64-linux-musl-cross.tgz -o- | tar -zxvf - -C /musl --strip-components=1'
56-
docker exec --tty "$CONTAINER_ID" git config --global --add safe.directory '*'
57-
docker exec --workdir "$PWD" --tty "$CONTAINER_ID" docker login --username $DOCKER_USERNAME --password $DOCKER_TOKEN
5852
echo "CONTAINER_ID=$CONTAINER_ID" >> "$GITHUB_ENV"
5953
6054
- name: Run Goreleaser

.github/workflows/manual-publish.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@ jobs:
3636
name: 'Get Docker token'
3737
with:
3838
aws_assume_role: ${{ vars.AWS_ROLE_ARN }}
39-
ssm_parameter_pairs: '/global/services/docker/public/username = DOCKER_USERNAME, /global/services/docker/public/token = DOCKER_TOKEN'
39+
ssm_parameter_pairs: |
40+
/global/services/docker/public/username = DOCKER_HUB_USERNAME
41+
/global/services/docker/public/token = DOCKER_HUB_TOKEN
4042
4143
- uses: ./.github/actions/publish
4244
id: publish

.github/workflows/release-please.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ jobs:
3838
name: 'Get Docker token'
3939
with:
4040
aws_assume_role: ${{ vars.AWS_ROLE_ARN }}
41-
ssm_parameter_pairs: '/global/services/docker/public/username = DOCKER_USERNAME, /global/services/docker/public/token = DOCKER_TOKEN'
41+
ssm_parameter_pairs: |
42+
/global/services/docker/public/username = DOCKER_HUB_USERNAME
43+
/global/services/docker/public/token = DOCKER_HUB_TOKEN
4244
4345
- uses: ./.github/actions/publish
4446
id: publish

0 commit comments

Comments
 (0)