Skip to content

Commit

Permalink
chore: Merge branch dev to main (#3)
Browse files Browse the repository at this point in the history
  • Loading branch information
PocketMiner82 committed Apr 2, 2024
2 parents 5a6a252 + 4285db4 commit d53c1b6
Show file tree
Hide file tree
Showing 8 changed files with 39 additions and 9 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
name: Build app
name: Build app on PR
on:
workflow_dispatch:
pull_request:
branches: [ main, dev ]


jobs:
Expand Down
27 changes: 27 additions & 0 deletions .github/workflows/create_pull_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Create PR from dev to main

on:
push:
branches:
- dev
workflow_dispatch:

env:
MESSAGE: Merge branch `${{ github.head_ref || github.ref_name }}` to `main`

jobs:
pull-request:
name: Open pull request
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Open pull request
uses: repo-sync/pull-request@v2
with:
destination_branch: 'main'
pr_title: 'chore: ${{ env.MESSAGE }}'
pr_body: |
This pull request will ${{ env.MESSAGE }}.
pr_draft: true
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Release
name: Create Release

on:
workflow_dispatch:
Expand Down
2 changes: 1 addition & 1 deletion AutoUpdater.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>1.2.4</version>
<version>1.2.5</version>
<url>https://github.com/PocketMiner82/pseudocode-ide/releases/latest/download/pseudocode-ide.zip</url>
<changelog>https://github.com/PocketMiner82/pseudocode-ide/releases</changelog>
<mandatory>false</mandatory>
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## [1.2.5-dev.1](https://github.com/PocketMiner82/pseudocode-ide/compare/1.2.4...1.2.5-dev.1) (2024-04-02)


### Bug Fixes

* this is not a fix but a test if a fix triggers a changelog entry, just removed unused imports. ([1860365](https://github.com/PocketMiner82/pseudocode-ide/commit/18603654b0daaac051191f77b56717ef4dc735e5))

## [1.2.4](https://github.com/PocketMiner82/pseudocode-ide/compare/1.2.3...1.2.4) (2024-04-02)

## [1.2.4-dev.5](https://github.com/PocketMiner82/pseudocode-ide/compare/1.2.4-dev.4...1.2.4-dev.5) (2024-04-02)
Expand Down
2 changes: 1 addition & 1 deletion SolutionInfo.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
using System.Reflection;

[assembly: AssemblyVersion("1.2.4")]
[assembly: AssemblyVersion("1.2.5")]
4 changes: 0 additions & 4 deletions pseudocodeIde/SetClipboardHelper.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace pseudocode_ide
Expand Down
1 change: 0 additions & 1 deletion pseudocodeIde/interpreter/scanner/Scanner.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using pseudocodeIde.interpreter.logging;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using static pseudocodeIde.interpreter.TokenType;

namespace pseudocodeIde.interpreter
Expand Down

0 comments on commit d53c1b6

Please sign in to comment.