Skip to content

Commit 8942d27

Browse files
PalmDevsPalmDevs
committed
build(Needs bump): fix webhook not triggering
1 parent ca3ac64 commit 8942d27

File tree

4 files changed

+96
-118
lines changed

4 files changed

+96
-118
lines changed

‎.github/workflows/release.yml

+1-12
Original file line numberDiff line numberDiff line change
@@ -50,22 +50,11 @@ jobs:
5050
- name: Setup Docker Buildx
5151
uses: docker/setup-buildx-action@v3
5252

53-
- name: Build and release
53+
- name: Build, release, publish
5454
env:
55-
RELEASE_WORKFLOW_STEP: release
5655
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5756
DOCKER_REGISTRY_USER: ${{ github.repository_owner }}
5857
DOCKER_REGISTRY_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
59-
DEBUG: semantic-release:*
60-
run: bunx multi-semantic-release --debug
61-
62-
# We call multi-semantic-release twice to publish in a different step
63-
# An environment variable determines which plugins in the config to run
64-
- name: Trigger Portainer webhooks
65-
if: github.ref == 'refs/heads/main'
66-
env:
67-
RELEASE_WORKFLOW_STEP: publish
68-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6958
WEBSOCKET_API_PORTAINER_WEBHOOK_URL: ${{ secrets.WEBSOCKET_API_PORTAINER_WEBHOOK_URL }}
7059
DISCORD_BOT_PORTAINER_WEBHOOK_URL: ${{ secrets.DISCORD_BOT_PORTAINER_WEBHOOK_URL }}
7160
run: bunx multi-semantic-release

‎apis/websocket/.releaserc.js

+24-28
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,28 @@
11
import defineSubprojectReleaseConfig from '../../semantic-release-config.js'
22

33
export default defineSubprojectReleaseConfig({
4-
plugins:
5-
process.env.RELEASE_WORKFLOW_STEP === 'publish'
6-
? [
7-
[
8-
'@semantic-release/exec',
9-
{
10-
publishCmd: 'bun run scripts/trigger-portainer-webhook.ts',
11-
},
12-
],
13-
]
14-
: [
15-
[
16-
'@codedependant/semantic-release-docker',
17-
{
18-
dockerImage: 'revanced-bot-websocket-api',
19-
dockerRegistry: 'ghcr.io',
20-
dockerProject: 'revanced',
21-
dockerContext: '../..',
22-
dockerPlatform: ['linux/amd64', 'linux/arm64'],
23-
dockerBuildQuiet: false,
24-
dockerTags: [
25-
'{{#if prerelease.[0]}}dev{{else}}main{{/if}}',
26-
'{{#unless prerelease.[0]}}latest{{/unless}}',
27-
'{{version}}',
28-
],
29-
},
30-
],
31-
],
4+
plugins: [
5+
[
6+
'@codedependant/semantic-release-docker',
7+
{
8+
dockerImage: 'revanced-bot-websocket-api',
9+
dockerRegistry: 'ghcr.io',
10+
dockerProject: 'revanced',
11+
dockerContext: '../..',
12+
dockerPlatform: ['linux/amd64', 'linux/arm64'],
13+
dockerBuildQuiet: false,
14+
dockerTags: [
15+
'{{#if prerelease.[0]}}dev{{else}}main{{/if}}',
16+
'{{#unless prerelease.[0]}}latest{{/unless}}',
17+
'{{version}}',
18+
],
19+
},
20+
],
21+
[
22+
'@semantic-release/exec',
23+
{
24+
successCmd: 'bun run scripts/trigger-portainer-webhook.ts',
25+
},
26+
],
27+
],
3228
})

‎bots/discord/.releaserc.js

+24-28
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,28 @@
11
import defineSubprojectReleaseConfig from '../../semantic-release-config.js'
22

33
export default defineSubprojectReleaseConfig({
4-
plugins:
5-
process.env.RELEASE_WORKFLOW_STEP === 'publish'
6-
? [
7-
[
8-
'@semantic-release/exec',
9-
{
10-
publishCmd: 'bun run scripts/trigger-portainer-webhook.ts',
11-
},
12-
],
13-
]
14-
: [
15-
[
16-
'@codedependant/semantic-release-docker',
17-
{
18-
dockerImage: 'revanced-bot-discord',
19-
dockerRegistry: 'ghcr.io',
20-
dockerProject: 'revanced',
21-
dockerContext: '../..',
22-
dockerPlatform: ['linux/amd64', 'linux/arm64'],
23-
dockerBuildQuiet: false,
24-
dockerTags: [
25-
'{{#if prerelease.[0]}}dev{{else}}main{{/if}}',
26-
'{{#unless prerelease.[0]}}latest{{/unless}}',
27-
'{{version}}',
28-
],
29-
},
30-
],
31-
],
4+
plugins: [
5+
[
6+
'@codedependant/semantic-release-docker',
7+
{
8+
dockerImage: 'revanced-bot-discord',
9+
dockerRegistry: 'ghcr.io',
10+
dockerProject: 'revanced',
11+
dockerContext: '../..',
12+
dockerPlatform: ['linux/amd64', 'linux/arm64'],
13+
dockerBuildQuiet: false,
14+
dockerTags: [
15+
'{{#if prerelease.[0]}}dev{{else}}main{{/if}}',
16+
'{{#unless prerelease.[0]}}latest{{/unless}}',
17+
'{{version}}',
18+
],
19+
},
20+
],
21+
[
22+
'@semantic-release/exec',
23+
{
24+
successCmd: 'bun run scripts/trigger-portainer-webhook.ts',
25+
},
26+
],
27+
],
3228
})

‎semantic-release-config.js

+47-50
Original file line numberDiff line numberDiff line change
@@ -11,55 +11,52 @@ const Options = {
1111
prerelease: true,
1212
},
1313
],
14-
plugins:
15-
process.env['RELEASE_WORKFLOW_STEP'] !== 'publish'
16-
? [
17-
[
18-
'@semantic-release/commit-analyzer',
19-
{
20-
releaseRules: [{ type: 'build', scope: 'Needs bump', release: 'patch' }],
21-
},
22-
],
23-
'@semantic-release/release-notes-generator',
24-
'@semantic-release/changelog',
25-
[
26-
'@semantic-release/npm',
27-
{
28-
npmPublish: false,
29-
},
30-
],
31-
[
32-
'@semantic-release/git',
33-
{
34-
assets: ['CHANGELOG.md', 'package.json', '../../bun.lockb'],
35-
},
36-
],
37-
[
38-
'@semantic-release/github',
39-
{
40-
assets: [
41-
{
42-
path: 'dist/*',
43-
},
44-
],
45-
successComment: false,
46-
},
47-
],
48-
// This unfortunately has to run multiple times, even though it needs to run only once.
49-
[
50-
'@saithodev/semantic-release-backmerge',
51-
{
52-
backmergeBranches: [
53-
{
54-
from: 'main',
55-
to: 'dev',
56-
},
57-
],
58-
clearWorkspace: true,
59-
},
60-
],
61-
]
62-
: [],
14+
plugins: [
15+
[
16+
'@semantic-release/commit-analyzer',
17+
{
18+
releaseRules: [{ type: 'build', scope: 'Needs bump', release: 'patch' }],
19+
},
20+
],
21+
'@semantic-release/release-notes-generator',
22+
'@semantic-release/changelog',
23+
[
24+
'@semantic-release/npm',
25+
{
26+
npmPublish: false,
27+
},
28+
],
29+
[
30+
'@semantic-release/git',
31+
{
32+
assets: ['CHANGELOG.md', 'package.json', '../../bun.lockb'],
33+
},
34+
],
35+
[
36+
'@semantic-release/github',
37+
{
38+
assets: [
39+
{
40+
path: 'dist/*',
41+
},
42+
],
43+
successComment: false,
44+
},
45+
],
46+
// This unfortunately has to run multiple times, even though it needs to run only once.
47+
[
48+
'@saithodev/semantic-release-backmerge',
49+
{
50+
backmergeBranches: [
51+
{
52+
from: 'main',
53+
to: 'dev',
54+
},
55+
],
56+
clearWorkspace: true,
57+
},
58+
],
59+
],
6360
}
6461

6562
/**
@@ -70,6 +67,6 @@ export default function defineSubprojectReleaseConfig(subprojectOptions) {
7067
return {
7168
...Options,
7269
...subprojectOptions,
73-
plugins: [...(subprojectOptions.plugins || []), ...(Options.plugins || [])],
70+
plugins: [...(Options.plugins || []), ...(subprojectOptions.plugins || [])],
7471
}
7572
}

0 commit comments

Comments
 (0)