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.

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

ci: use 'unstable' as sync branch target #15

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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/sync-upstream.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,18 @@ jobs:
- name: Check if sync-upstream branch exists in remote
id: check_remote_branch
run: |
echo "stdout=$(git ls-remote --heads origin sync-upstream)" >> $GITHUB_OUTPUT
echo "stdout=$(git ls-remote --heads origin unstable)" >> $GITHUB_OUTPUT

- name: update dae package
run: |
git config user.name "daebot"
git config user.email "daebot@v2raya.org"
git checkout -B sync-upstream
git checkout -B unstable

nix run nixpkgs#nix-update -- --commit --version=branch --flake dae

if [[ "${{ steps.check_remote_branch.outputs.stdout }}" != '' ]]; then
git pull origin sync-upstream --rebase
git pull origin unstable --rebase
fi
git push -u origin sync-upstream
git push -u origin unstable
shell: bash
2 changes: 1 addition & 1 deletion dae/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
}:
buildGoModule rec {
pname = "dae";
version = "unstable-2023-09-04";
version = "unstable-2024-02-14";

src = fetchFromGitHub {
owner = "daeuniverse";
Expand Down
Loading