Skip to content

Commit aa0beaf

Browse files
committed
chore: rekres
Get some updates. Signed-off-by: Andrey Smirnov <[email protected]>
1 parent c6b0f57 commit aa0beaf

File tree

4 files changed

+17
-16
lines changed

4 files changed

+17
-16
lines changed

.github/workflows/ci.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
#
3-
# Generated on 2024-11-11T14:23:10Z by kres b6443eb.
3+
# Generated on 2024-11-25T17:37:38Z by kres 232fe63.
44

55
name: default
66
concurrency:
@@ -33,7 +33,7 @@ jobs:
3333
labels: ${{ steps.retrieve-pr-labels.outputs.result }}
3434
services:
3535
buildkitd:
36-
image: moby/buildkit:v0.17.1
36+
image: moby/buildkit:v0.17.2
3737
options: --privileged
3838
ports:
3939
- 1234:1234
@@ -129,7 +129,7 @@ jobs:
129129
- default
130130
services:
131131
buildkitd:
132-
image: moby/buildkit:v0.17.1
132+
image: moby/buildkit:v0.17.2
133133
options: --privileged
134134
ports:
135135
- 1234:1234

.github/workflows/slack-notify.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
#
3-
# Generated on 2023-11-27T19:06:58Z by kres latest.
3+
# Generated on 2024-11-25T17:37:38Z by kres 232fe63.
44

55
name: slack-notify
66
"on":
@@ -25,11 +25,12 @@ jobs:
2525
run: |
2626
echo pull_request_number=$(gh pr view -R ${{ github.repository }} ${{ github.event.workflow_run.head_repository.owner.login }}:${{ github.event.workflow_run.head_branch }} --json number --jq .number) >> $GITHUB_OUTPUT
2727
- name: Slack Notify
28-
uses: slackapi/slack-github-action@v1
28+
uses: slackapi/slack-github-action@v2
2929
with:
30-
channel-id: proj-talos-maintainers
30+
method: chat.postMessage
3131
payload: |
3232
{
33+
"channel": "proj-talos-maintainers",
3334
"attachments": [
3435
{
3536
"color": "${{ github.event.workflow_run.conclusion == 'success' && '#2EB886' || github.event.workflow_run.conclusion == 'failure' && '#A30002' || '#FFCC00' }}",
@@ -89,5 +90,4 @@ jobs:
8990
}
9091
]
9192
}
92-
env:
93-
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
93+
token: ${{ secrets.SLACK_BOT_TOKEN }}

.github/workflows/weekly.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
#
3-
# Generated on 2024-11-11T14:23:10Z by kres b6443eb.
3+
# Generated on 2024-11-25T17:37:38Z by kres 232fe63.
44

55
name: weekly
66
concurrency:
@@ -16,7 +16,7 @@ jobs:
1616
- pkgs
1717
services:
1818
buildkitd:
19-
image: moby/buildkit:v0.17.1
19+
image: moby/buildkit:v0.17.2
2020
options: --privileged
2121
ports:
2222
- 1234:1234

Makefile

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
#
3-
# Generated on 2024-11-11T14:23:10Z by kres b6443eb.
3+
# Generated on 2024-11-25T17:37:38Z by kres 232fe63.
44

55
# common variables
66

@@ -36,12 +36,13 @@ PLATFORM ?= linux/amd64,linux/arm64
3636
PROGRESS ?= auto
3737
PUSH ?= false
3838
CI_ARGS ?=
39+
BUILDKIT_MULTI_PLATFORM ?= 1
3940
COMMON_ARGS = --file=Pkgfile
4041
COMMON_ARGS += --provenance=false
4142
COMMON_ARGS += --progress=$(PROGRESS)
4243
COMMON_ARGS += --platform=$(PLATFORM)
4344
COMMON_ARGS += --build-arg=SOURCE_DATE_EPOCH=$(SOURCE_DATE_EPOCH)
44-
COMMON_ARGS += --build-arg=BUILDKIT_MULTI_PLATFORM=1
45+
COMMON_ARGS += --build-arg=BUILDKIT_MULTI_PLATFORM=$(BUILDKIT_MULTI_PLATFORM)
4546

4647
# targets defines all the available targets
4748

@@ -111,13 +112,13 @@ target-%: ## Builds the specified target defined in the Pkgfile. The build resu
111112

112113
local-%: ## Builds the specified target defined in the Pkgfile using the local output type. The build result will be output to the specified local destination.
113114
@$(MAKE) target-$* TARGET_ARGS="--output=type=local,dest=$(DEST) $(TARGET_ARGS)"
114-
@PLATFORM=$(PLATFORM) ARTIFACTS=$(ARTIFACTS) bash -c '\
115+
@PLATFORM=$(PLATFORM) DEST=$(DEST) bash -c '\
115116
for platform in $$(tr "," "\n" <<< "$$PLATFORM"); do \
116117
echo $$platform; \
117118
directory="$${platform//\//_}"; \
118-
if [[ -d "$$ARTIFACTS/$$directory" ]]; then \
119-
mv "$$ARTIFACTS/$$directory/"* $$ARTIFACTS; \
120-
rmdir "$$ARTIFACTS/$$directory/"; \
119+
if [[ -d "$$DEST/$$directory" ]]; then \
120+
mv "$$DEST/$$directory/"* $$DEST; \
121+
rmdir "$$DEST/$$directory/"; \
121122
fi; \
122123
done'
123124

0 commit comments

Comments
 (0)