Skip to content

Commit

Permalink
fixing merge
Browse files Browse the repository at this point in the history
  • Loading branch information
Janis Erdmanis committed Jun 20, 2024
1 parent de5d770 commit 66c9514
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 11 deletions.
20 changes: 20 additions & 0 deletions .github/workflows/TagBot.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: TagBot
on:
issue_comment:
types:
- created
workflow_dispatch:
inputs:
lookback:
default: 3
permissions:
contents: write
jobs:
TagBot:
if: github.event_name == 'workflow_dispatch' || github.actor == 'JuliaTagBot'
runs-on: ubuntu-latest
steps:
- uses: JuliaRegistries/TagBot@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
ssh: ${{ secrets.DOCUMENTER_KEY }}
10 changes: 1 addition & 9 deletions Project.toml
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
name = "AppBundler"
uuid = "40eb83ae-c93a-480c-8f39-f018b568f472"
authors = ["Janis Erdmanis <janiserdmanis@protonmail.ch>"]
<<<<<<< HEAD
version = "0.1.3"
=======
version = "0.1.1"
>>>>>>> 1d9151f1f5282bb78b5845874db9052fb75efb0e

[deps]
Artifacts = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
Expand All @@ -31,8 +27,4 @@ Tar = "1"
ZipFile = "0.10"
julia = "1"
p7zip_jll = "17.4"
<<<<<<< HEAD
squashfs_tools_jll = "4.6"
=======
julia = "1"
>>>>>>> 1d9151f1f5282bb78b5845874db9052fb75efb0e
squashfs_tools_jll = "4.6"
2 changes: 0 additions & 2 deletions src/deps.jl
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import Downloads
import Artifacts

using Infiltrator

import Pkg
import Base.BinaryPlatforms: AbstractPlatform, Platform, os, arch, wordsize

Expand Down

2 comments on commit 66c9514

@JanisErdmanis
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator register

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/109445

Tip: Release Notes

Did you know you can add release notes too? Just add markdown formatted text underneath the comment after the text
"Release notes:" and it will be added to the registry PR, and if TagBot is installed it will also be added to the
release that TagBot creates. i.e.

@JuliaRegistrator register

Release notes:

## Breaking changes

- blah

To add them here just re-invoke and the PR will be updated.

Tagging

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v0.1.3 -m "<description of version>" 66c951444e4787e533a6e98d720586c7fffcebbe
git push origin v0.1.3

Please sign in to comment.