Skip to content

Commit d55998f

Browse files
authored
ci: set submodule diff action output directly (#122)
1 parent 461fc92 commit d55998f

File tree

1 file changed

+10
-13
lines changed

1 file changed

+10
-13
lines changed

.github/workflows/main.yml

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
outputs:
3232
ci: ${{ !contains(steps.metadata.outputs.dependency-names, 'swiftorg') }}
3333
merge: ${{ steps.update-swiftorg.outputs.result == 'true' }}
34-
approve: ${{ fromJSON(steps.changed-submodule-files.outputs.result).swift_release == 'true' }}
34+
approve: ${{ steps.changed-submodule-files.outputs.swift_release == 'true' }}
3535

3636
steps:
3737
- name: Dependabot metadata
@@ -79,39 +79,36 @@ jobs:
7979
const parts = line.split('\t');
8080
return parts.length > 2 ? [parts[1], parts[2]] : [parts[1]];
8181
}).filter((file) => /(download\/(index.md|_older-releases.md)|_data\/builds\/.*)/.exec(file));
82-
return {
83-
any_changed: files.length > 0,
84-
swift_release: files.some(file => /_data\/builds\/(swift-.*-release.*|swift_releases\.yml)/.exec(file))
85-
};
82+
83+
core.setOutput('any_changed', files.length > 0);
84+
core.setOutput('swift_release', files.some(file => /_data\/builds\/(swift-.*-release.*|swift_releases\.yml)/.exec(file)));
8685
} catch (error) {
8786
core.error(error);
88-
return {
89-
any_changed: true,
90-
swift_release: false
91-
};
87+
core.setOutput('any_changed', true);
88+
core.setOutput('swift_release', false);
9289
}
9390
9491
- name: Setup Node.js
95-
if: fromJSON(steps.changed-submodule-files.outputs.result).any_changed == 'true'
92+
if: steps.changed-submodule-files.outputs.any_changed == 'true'
9693
id: setup-node
9794
uses: actions/setup-node@v3
9895
with:
9996
cache: npm
10097

10198
- name: Cache dependencies
102-
if: fromJSON(steps.changed-submodule-files.outputs.result).any_changed == 'true'
99+
if: steps.changed-submodule-files.outputs.any_changed == 'true'
103100
id: cache-node
104101
uses: actions/[email protected]
105102
with:
106103
key: node-${{ github.ref }}
107104
path: node_modules
108105

109106
- name: Setup npm pacakges
110-
if: fromJSON(steps.changed-submodule-files.outputs.result).any_changed == 'true'
107+
if: steps.changed-submodule-files.outputs.any_changed == 'true'
111108
run: npm install
112109

113110
- name: Update submodule ref in package.json
114-
if: fromJSON(steps.changed-submodule-files.outputs.result).any_changed == 'true'
111+
if: steps.changed-submodule-files.outputs.any_changed == 'true'
115112
id: update-swiftorg
116113
uses: actions/github-script@v6
117114
with:

0 commit comments

Comments
 (0)