Skip to content

Commit 6604d4f

Browse files
mgoversmgovers
committed
restore CI; reproducible build in nightly
Signed-off-by: Martijn Govers <Martijn.Govers@Alliander.com>
1 parent ae9e722 commit 6604d4f

2 files changed

Lines changed: 71 additions & 71 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 68 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -33,83 +33,80 @@ jobs:
3333
steps:
3434
- run: echo "ci started"
3535

36-
# build-test-release:
37-
# name: build-test-release
38-
# uses: "./.github/workflows/build-test-release.yml"
39-
# permissions:
40-
# contents: write
41-
# with:
42-
# # create_release becomes true if the event that triggered this workflow is "workflow_dispatch" and inputs.create_release is true
43-
# # create_release becomes true if the event that triggered this workflow is "push" on main
44-
# # otherwise create_release becomes false
45-
# create_release: ${{ (github.event_name == 'workflow_dispatch' && inputs.create_release) || github.event_name == 'push'}}
36+
build-test-release:
37+
name: build-test-release
38+
uses: "./.github/workflows/build-test-release.yml"
39+
permissions:
40+
contents: write
41+
with:
42+
# create_release becomes true if the event that triggered this workflow is "workflow_dispatch" and inputs.create_release is true
43+
# create_release becomes true if the event that triggered this workflow is "push" on main
44+
# otherwise create_release becomes false
45+
create_release: ${{ (github.event_name == 'workflow_dispatch' && inputs.create_release) || github.event_name == 'push'}}
4646

47-
# check-code-quality:
48-
# uses: "./.github/workflows/check-code-quality.yml"
47+
check-code-quality:
48+
uses: "./.github/workflows/check-code-quality.yml"
4949

50-
# reuse-compliance:
51-
# uses: "./.github/workflows/reuse-compliance.yml"
50+
reuse-compliance:
51+
uses: "./.github/workflows/reuse-compliance.yml"
5252

53-
# clang-tidy:
54-
# uses: "./.github/workflows/clang-tidy.yml"
55-
# with:
56-
# target: "all"
53+
clang-tidy:
54+
uses: "./.github/workflows/clang-tidy.yml"
55+
with:
56+
target: "all"
5757

58-
check-build-reproducibility:
59-
uses: "./.github/workflows/check-build-reproducibility.yml" # TODO(mgovers): remove this line once the workflow is stable
60-
61-
# ci-passed:
62-
# runs-on: ubuntu-latest
63-
# needs: [ci-started, build-test-release, check-code-quality, reuse-compliance, clang-tidy]
64-
# if: always()
58+
ci-passed:
59+
runs-on: ubuntu-latest
60+
needs: [ci-started, build-test-release, check-code-quality, reuse-compliance, clang-tidy]
61+
if: always()
6562

66-
# steps:
67-
# # this explicit check is needed cfr. https://github.com/orgs/community/discussions/75568
68-
# - name: "Check whether all jobs passed"
69-
# run: echo '${{ toJSON(needs) }}' | jq -e 'to_entries | all(.value.result == "success")'
70-
# - run: echo "ci passed"
63+
steps:
64+
# this explicit check is needed cfr. https://github.com/orgs/community/discussions/75568
65+
- name: "Check whether all jobs passed"
66+
run: echo '${{ toJSON(needs) }}' | jq -e 'to_entries | all(.value.result == "success")'
67+
- run: echo "ci passed"
7168

72-
# publish:
73-
# name: Publish to PyPI
74-
# runs-on: ubuntu-latest
75-
# permissions:
76-
# contents: write
77-
# id-token: write # Required for Trusted Publishing
78-
# needs: build-test-release
79-
# if: (github.event_name == 'workflow_dispatch') || github.event_name == 'push'
69+
publish:
70+
name: Publish to PyPI
71+
runs-on: ubuntu-latest
72+
permissions:
73+
contents: write
74+
id-token: write # Required for Trusted Publishing
75+
needs: build-test-release
76+
if: (github.event_name == 'workflow_dispatch') || github.event_name == 'push'
8077

81-
# steps:
82-
# - name: Download assets from GitHub release
83-
# uses: robinraju/release-downloader@v1
84-
# with:
85-
# repository: ${{ github.repository }}
86-
# # download the latest release
87-
# latest: true
88-
# # don't download pre-releases
89-
# preRelease: false
90-
# fileName: "*"
91-
# # don't download GitHub-generated source tar and zip files
92-
# tarBall: false
93-
# zipBall: false
94-
# # create a directory to store the downloaded assets
95-
# out-file-path: assets-to-publish
96-
# # don't extract downloaded files
97-
# extract: false
78+
steps:
79+
- name: Download assets from GitHub release
80+
uses: robinraju/release-downloader@v1
81+
with:
82+
repository: ${{ github.repository }}
83+
# download the latest release
84+
latest: true
85+
# don't download pre-releases
86+
preRelease: false
87+
fileName: "*"
88+
# don't download GitHub-generated source tar and zip files
89+
tarBall: false
90+
zipBall: false
91+
# create a directory to store the downloaded assets
92+
out-file-path: assets-to-publish
93+
# don't extract downloaded files
94+
extract: false
9895

99-
# - name: List downloaded assets
100-
# run: ls -la assets-to-publish
96+
- name: List downloaded assets
97+
run: ls -la assets-to-publish
10198

102-
# - name: Upload assets to PyPI
103-
# uses: pypa/gh-action-pypi-publish@release/v1
104-
# with:
105-
# # To test, use the TestPyPI:
106-
# # repository-url: https://test.pypi.org/legacy/
107-
# # You must also create an account and project on TestPyPI,
108-
# # as well as set the trusted-publisher in the project settings:
109-
# # https://docs.pypi.org/trusted-publishers/adding-a-publisher/
110-
# # To publish to the official PyPI repository, just keep
111-
# # repository-url commented out.
112-
# packages-dir: assets-to-publish
113-
# skip-existing: true
114-
# print-hash: true
115-
# verbose: true
99+
- name: Upload assets to PyPI
100+
uses: pypa/gh-action-pypi-publish@release/v1
101+
with:
102+
# To test, use the TestPyPI:
103+
# repository-url: https://test.pypi.org/legacy/
104+
# You must also create an account and project on TestPyPI,
105+
# as well as set the trusted-publisher in the project settings:
106+
# https://docs.pypi.org/trusted-publishers/adding-a-publisher/
107+
# To publish to the official PyPI repository, just keep
108+
# repository-url commented out.
109+
packages-dir: assets-to-publish
110+
skip-existing: true
111+
print-hash: true
112+
verbose: true

‎.github/workflows/nightly.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ jobs:
2222
with:
2323
create_release: false
2424

25+
check-build-reproducibility:
26+
uses: "./.github/workflows/check-build-reproducibility.yml"
27+
2528
check-code-quality:
2629
uses: "./.github/workflows/check-code-quality.yml"
2730

0 commit comments

Comments
 (0)