0
0
mirror of https://github.com/neon-mmd/websurfx.git synced 2024-11-22 05:58:21 -05:00

Compare commits

...

30 Commits

Author SHA1 Message Date
Scott
1e7997d9e1
Merge 33a861ffd4 into 779908cb11 2024-01-29 19:28:16 +00:00
Scott
33a861ffd4
Update Cargo.toml 2024-01-29 14:28:13 -05:00
Scott
31837eb7ec ci: testing PR create and merge - testing to see if merge loop stops 2024-01-29 14:14:11 -05:00
Scott
4c056a327c ci: testing PR create and merge - testing PAT 2024-01-29 13:00:30 -05:00
Scott
a5284e8b62 ci: testing PR create and merge - potentially fixed PR issue + fixing what branch it targets 2024-01-29 12:30:11 -05:00
Scott
7748ed2b08 ci: testing PR create and merge - potentially fixed PR issue2 2024-01-29 11:30:26 -05:00
scottc943
a7b8be2bdf Apply automatic changes 2024-01-29 16:06:38 +00:00
Scott
c62a0c07b4 ci: testing PR create and merge - potentially fixed PR issue 2024-01-29 11:05:40 -05:00
scottc943
39d9dccb7a Apply automatic changes 2024-01-29 15:52:57 +00:00
Scott
542f27f5ca ci: testing PR create and merge - fixed permission issues 2024-01-29 10:52:16 -05:00
Scott
0ec25642db Merge branch 'FEATURE/400_GitHubActions-automate-release-versions-PR' of github.com:scottc943/websurfx into FEATURE/400_GitHubActions-automate-release-versions-PR 2024-01-29 10:51:30 -05:00
Scott
d9841bfdcd ci: testing PR create and merge - fixed permission issues 2024-01-29 10:51:21 -05:00
scottc943
c95bb7d000 Apply automatic changes 2024-01-29 15:48:16 +00:00
Scott
6e60be365b ci: testing PR create and merge - removed the if that was causing it not to run 2024-01-29 10:47:30 -05:00
Scott
f0c365a6bb Merge branch 'FEATURE/400_GitHubActions-automate-release-versions-PR' of github.com:scottc943/websurfx into FEATURE/400_GitHubActions-automate-release-versions-PR 2024-01-29 10:46:58 -05:00
Scott
5c98982612 ci: testing PR create and merge - removed the if that was causing it not to run 2024-01-29 10:46:36 -05:00
scottc943
976af538e1 Apply automatic changes 2024-01-29 15:39:21 +00:00
Scott
75468a296a
Merge branch 'rolling' into FEATURE/400_GitHubActions-automate-release-versions-PR 2024-01-29 10:38:05 -05:00
Scott
2e653d1905 ci: testing autocommit with branch protection and doing a PR to rolling 2024-01-29 10:36:19 -05:00
scottc943
e0b683b4ca Apply automatic changes 2024-01-29 13:07:27 +00:00
Scott
ac6f95e7e9
Merge pull request #28 from scottc943/FEATURE/400_GitHubActions-automate-release-versions-PR
ci: testing autocommit: removing tagging since it creates another tag…
2024-01-29 08:07:12 -05:00
Scott
559c7fcb76 ci: testing autocommit: removing tagging since it creates another tag instead of using that tag 2024-01-29 08:06:26 -05:00
Scott
599fa431b3
Merge pull request #27 from scottc943/FEATURE/400_GitHubActions-automate-release-versions-PR
Feature/400 git hub actions automate release versions pr
2024-01-29 08:04:56 -05:00
Scott
d40e5ed1a6 Merge branch 'FEATURE/400_GitHubActions-automate-release-versions-PR' of github.com:scottc943/websurfx into FEATURE/400_GitHubActions-automate-release-versions-PR 2024-01-29 08:04:03 -05:00
Scott
e0b0d34750 ci: testing autocommit further 2024-01-29 08:03:49 -05:00
scottc943
8f8e1b7597 Apply automatic changes 2024-01-29 13:00:02 +00:00
Scott
3308b0256e
Merge pull request #26 from scottc943/FEATURE/400_GitHubActions-automate-release-versions-PR
ci: testing autocommit
2024-01-29 07:59:44 -05:00
Scott
9df36aeead ci: testing autocommit 2024-01-29 07:58:57 -05:00
Scott
c9c54f60fc
Merge pull request #25 from scottc943/FEATURE/400_GitHubActions-automate-release-versions-PR
Feature/400 git hub actions automate release versions pr
2024-01-29 07:14:09 -05:00
Scott
563155077b
Merge pull request #24 from scottc943/FEATURE/400_GitHubActions-automate-release-versions-PR
Feature/400 git hub actions automate release versions pr
2024-01-29 07:09:16 -05:00

View File

@ -7,13 +7,15 @@ on:
permissions:
contents: write
pull-requests: write
repository-projects: write
concurrency: production
jobs:
build:
name: bump tag version and release
if: github.event.pull_request.merged == true
if: github.event.pull_request.merged == true
runs-on: ubuntu-latest
steps:
- name: Checkout code
@ -27,15 +29,34 @@ jobs:
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
release_branches: rolling
- name: get-app-version
id: package-version
run: |
LF_VERSION=$(cat package.json | jq -r '.version')
echo "current-version=$LF_VERSION" >> "$GITHUB_OUTPUT"
- name: create branch
uses: peterjgrainger/action-create-branch@v2.2.0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
branch: update-from-${{ github.sha }}
- name: update cargo.toml
run: |
appversion=$(echo "${{ steps.version-bump.outputs.new_tag }}" | sed 's/[v]//')
sed -i -e "s/^version = .*/version = \"$appversion\"/" Cargo.toml
- name: auto commit
uses: stefanzweifel/git-auto-commit-action@v5
with:
commit_message: "[skip ci] Automated Change"
branch: update-from-${{ github.sha }}
# create PR using GitHub CLI
- name: create PR with update info
id: create-pr
run: gh pr create --base rolling --head update-from-${{ github.sha }} --title 'Merge new update into rolling' --body 'Created by Github action'
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# merge PR using GitHub CLI
- name: merge PR with update info
id: merge-pr
run: gh pr merge --admin --merge --subject 'Merge update info' --delete-branch
env:
GH_TOKEN: ${{ secrets.ADMIN_RIGHTS_TOKEN }}
- name: Create Release
uses: softprops/action-gh-release@v1
with: