Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge release into master branch #6

Merged
merged 5 commits into from
Jan 7, 2025
Merged

Merge release into master branch #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6c7ffb8
fix
cn337131 Jan 7, 2025
322a598
Merge pull request #5 from cn337131/test-release-changes
cn337131 Jan 7, 2025
bc6eff2
prepare release koryphe-2.8.0
github-actions[bot] Jan 7, 2025
4b91176
Merge branch 'master' into release/2.8.0
cn337131 Jan 7, 2025
7c30f51
fix
cn337131 Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
uses: actions/checkout@v4
with:
ref: master
token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
token: ${{ github.token }}
fetch-depth: 0

- name: Set up Github credentials
Expand All @@ -52,7 +52,7 @@ jobs:
uses: actions/checkout@v4
with:
ref: master
token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
token: ${{ github.token }}

- name: Set up Github credentials
run: |
Expand Down Expand Up @@ -133,7 +133,7 @@ jobs:
- name: Create release notes
uses: softprops/action-gh-release@v2
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ github.token }}
with:
tag_name: ${{ env.artifactId }}-${{ env.RELEASE_VERSION }}
name: Koryphe ${{ env.RELEASE_VERSION }}
Expand All @@ -148,7 +148,7 @@ jobs:
uses: actions/checkout@v4
with:
ref: develop
token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
token: ${{ github.token }}
fetch-depth: 0

- name: Set up Github credentials
Expand Down
5 changes: 3 additions & 2 deletions core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2017-2022 Crown Copyright
~ Copyright 2017-2025 Crown Copyright
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
Expand All @@ -19,7 +19,8 @@
<parent>
<artifactId>koryphe</artifactId>
<groupId>uk.gov.gchq.koryphe</groupId>
<version>2.7.0</version>
<version>2.8.0</version>

</parent>
<packaging>jar</packaging>
<modelVersion>4.0.0</modelVersion>
Expand Down
4 changes: 2 additions & 2 deletions doc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2017-2022 Crown Copyright
~ Copyright 2017-2025 Crown Copyright
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
Expand All @@ -19,7 +19,7 @@
<parent>
<artifactId>koryphe</artifactId>
<groupId>uk.gov.gchq.koryphe</groupId>
<version>2.7.0</version>
<version>2.8.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2017-2023 Crown Copyright
~ Copyright 2017-2025 Crown Copyright
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
Expand All @@ -20,7 +20,7 @@

<groupId>uk.gov.gchq.koryphe</groupId>
<artifactId>koryphe</artifactId>
<version>2.7.0</version>
<version>2.8.0</version>
<packaging>pom</packaging>

<name>${project.groupId}:${project.artifactId}</name>
Expand Down
Loading