Skip to content

Commit

Permalink
Merge pull request #25 from dnv-opensource/24-change-publishing-workf…
Browse files Browse the repository at this point in the history
…low-to-use-openid-connect-trusted-publisher-management-when-publishing-to-pypi

24 change publishing workflow to use openid connect trusted publisher management when publishing to pypi
  • Loading branch information
ClaasRostock authored Feb 27, 2024
2 parents af4c683 + 5213655 commit 1df2024
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 18 deletions.
15 changes: 5 additions & 10 deletions .github/workflows/_publish_package.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,17 @@
name: Publish Package to pypi

on:
workflow_call:
secrets:
PYPI_API_TOKEN:
required: true
on: workflow_call

jobs:
publish:
name: Publish package
runs-on: ubuntu-latest
environment: pypi
environment: release
permissions:
id-token: write
steps:
- uses: actions/download-artifact@v3
with:
name: artifact
path: ./dist/
- uses: pypa/gh-action-pypi-publish@v1.5.2
with:
user: __token__
password: ${{ secrets.PYPI_API_TOKEN }}
- uses: pypa/gh-action-pypi-publish@release/v1
2 changes: 0 additions & 2 deletions .github/workflows/publish_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ jobs:
needs:
- build_package
uses: ./.github/workflows/_publish_package.yml
secrets:
PYPI_API_TOKEN: ${{ secrets.PYPI_API_TOKEN }}
merge_into_release:
uses: ./.github/workflows/_merge_into_release.yml
secrets:
Expand Down
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ The changelog format is based on [Keep a Changelog](https://keepachangelog.com/e

## [Unreleased]

* -/-
### Changed
* Changed publishing workflow to use OpenID Connect (Trusted Publisher Management) when publishing to PyPI
* Updated copyright statement


## [0.3.6] - 2024-02-21
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ _For a detailed documentation of the dictIO dict file format used by farn, see [
## Meta
Copyright (c) 2024 [DNV](https://www.dnv.com) [open source](https://github.com/dnv-opensource)
Copyright (c) 2024 [DNV](https://www.dnv.com) SE. All rights reserved.
Frank Lumpitzsch – [@LinkedIn](https://www.linkedin.com/in/frank-lumpitzsch-23013196/) – frank.lumpitzsch@dnv.com
Expand All @@ -138,9 +138,9 @@ Distributed under the MIT license. See [LICENSE](LICENSE.md) for more informatio
## Contributing
1. Fork it (<https://github.com/dnv-opensource/farn/fork>)
2. Create your branch (`git checkout -b myBranchName`)
3. Commit your changes (e.g. `git commit -m 'place a descriptive commit message here'`)
4. Push to the branch (e.g. `git push origin myBranchName`)
2. Create your branch (`git checkout -b my-branch-name`)
3. Commit your changes (`git commit -am 'place a descriptive commit message here'`)
4. Push to the branch (`git push origin my-branch-name`)
5. Create a new Pull Request in GitHub
For your contribution, please make sure you follow the [STYLEGUIDE](STYLEGUIDE.md) before creating the Pull Request.
Expand Down
3 changes: 2 additions & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,11 @@

sys.path.insert(0, os.path.abspath("../../src"))


# -- Project information -----------------------------------------------------

project = "farn"
copyright = "2024, DNV. Frank Lumpitzsch, Claas Rostock, Seung Hyeon Yoo"
copyright = "2024, DNV SE. All rights reserved."
author = "Frank Lumpitzsch, Claas Rostock, Seung Hyeon Yoo"

# The full version, including alpha/beta/rc tags
Expand Down

0 comments on commit 1df2024

Please sign in to comment.