Skip to content

Commit

Permalink
Merge pull request #649 from HathorNetwork/release-candidate
Browse files Browse the repository at this point in the history
chore: Merge `release-candidate` into `release`
  • Loading branch information
pedroferreira1 authored Jul 29, 2024
2 parents 3b114b1 + d3e189d commit bac07fc
Show file tree
Hide file tree
Showing 69 changed files with 3,256 additions and 1,005 deletions.
30 changes: 30 additions & 0 deletions .github/workflows/release-merge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Create PR on Release

# Triggered when a new version is released publicly
on:
release:
types: [released]

jobs:
create-pull-request:
runs-on: ubuntu-latest

steps:
- name: Checkout
id: checkout
# https://github.com/actions/checkout/releases/tag/v4.1.6
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29

- name: Create Pull Request
id: create_pull
env:
GH_TOKEN: ${{ secrets.RELEASE_TOKEN }}
run: |
# Building the PR Data
PR_DATA=$(gh pr create \
--title "[${{ github.ref_name }}] Merge release into master" \
--body "Automated PR to merge `release` branch into `master` based on release event." \
--base "master" \
--head "release" \
--assignee "@me")
echo "Merge PR url: $PR_DATA"
66 changes: 51 additions & 15 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
let pkgs = import nixpkgs {
inherit system;

overlays = [ devshell.overlay ];
overlays = [ devshell.overlays.default ];
};
in
pkgs.devshell.mkShell {
packages = with pkgs; [
nixpkgs-fmt
nodejs-14_x
nodejs_20
libusb1
];
};
Expand Down
Loading

0 comments on commit bac07fc

Please sign in to comment.