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

chore: Update the pkgsrc versions in the update-versions tool #2886

Merged

Conversation

robinlinden
Copy link
Member

@robinlinden robinlinden commented Feb 24, 2025

robin@0:~/code/c-toxcore$ ./tools/update-versions.sh 0.2.22
+ VERSION=0.2.22
++ git rev-parse --show-toplevel
+ GIT_ROOT=/home/robin/code/c-toxcore
+ cd /home/robin/code/c-toxcore
+ VERSION=0.2.22
+ IFS=.
+ read -ra version_parts
+ other/version-sync /home/robin/code/c-toxcore 0 2 22
5c5
< AC_INIT([tox], [0.2.20])
---
> AC_INIT([tox], [0.2.22])
157c157
< #define TOX_VERSION_PATCH              20
---
> #define TOX_VERSION_PATCH              22
47c47
< set(PROJECT_VERSION_PATCH "20")
---
> set(PROJECT_VERSION_PATCH "22")
4c4
< COPY . /work/c-toxcore-0.2.20
---
> COPY . /work/c-toxcore-0.2.22
5c5
< RUN ["tar", "zcf", "c-toxcore.tar.gz", "c-toxcore-0.2.20"]
---
> RUN ["tar", "zcf", "c-toxcore.tar.gz", "c-toxcore-0.2.22"]
9c9
< +DISTNAME=    toxcore-0.2.20
---
> +DISTNAME=    toxcore-0.2.22
29c29
< +lib/libtoxcore.so.2.20.0
---
> +lib/libtoxcore.so.2.22.0
14c14
< CURRENT=22
---
> CURRENT=24
16c16
< AGE=20
---
> AGE=22
robin@0:~/code/c-toxcore$ git diff other/docker/pkgsrc/
diff --git a/other/docker/pkgsrc/pkgsrc.Dockerfile b/other/docker/pkgsrc/pkgsrc.Dockerfile
index 58dd3ed7..b55cf4d2 100644
--- a/other/docker/pkgsrc/pkgsrc.Dockerfile
+++ b/other/docker/pkgsrc/pkgsrc.Dockerfile
@@ -1,8 +1,8 @@
 FROM toxchat/pkgsrc:latest

 WORKDIR /work
-COPY . /work/c-toxcore-0.2.20
-RUN ["tar", "zcf", "c-toxcore.tar.gz", "c-toxcore-0.2.20"]
+COPY . /work/c-toxcore-0.2.22
+RUN ["tar", "zcf", "c-toxcore.tar.gz", "c-toxcore-0.2.22"]

 WORKDIR /work/pkgsrc
 COPY other/docker/pkgsrc/pkgsrc.patch /tmp/pkgsrc.patch
diff --git a/other/docker/pkgsrc/pkgsrc.patch b/other/docker/pkgsrc/pkgsrc.patch
index 4d2dba1f..8eb03423 100644
--- a/other/docker/pkgsrc/pkgsrc.patch
+++ b/other/docker/pkgsrc/pkgsrc.patch
@@ -6,7 +6,7 @@ index 70466704d..53a08ad08 100644
  # $NetBSD: Makefile,v 1.6 2024/01/22 13:16:56 ryoon Exp $

 -DISTNAME=     toxcore-0.2.18
-+DISTNAME=     toxcore-0.2.20
++DISTNAME=     toxcore-0.2.22
  PKGREVISION=  2
  CATEGORIES=   chat
  MASTER_SITES= ${MASTER_SITE_GITHUB:=TokTok/}
@@ -26,6 +26,6 @@ index f0a5e4f04..4122b0867 100644
  lib/libtoxcore.so
  lib/libtoxcore.so.2
 -lib/libtoxcore.so.2.18.0
-+lib/libtoxcore.so.2.20.0
++lib/libtoxcore.so.2.22.0
  lib/pkgconfig/toxcore.pc
  share/bash-completion/completions/tox-bootstrapd

This change is Reviewable

@github-actions github-actions bot added the chore Updating grunt tasks etc; no production code change label Feb 24, 2025
@robinlinden robinlinden marked this pull request as ready for review February 24, 2025 01:10
@iphydf iphydf added this to the v0.2.21 milestone Feb 24, 2025
@toktok-releaser toktok-releaser merged commit 9303e2e into TokTok:master Feb 24, 2025
83 checks passed
@robinlinden robinlinden deleted the chore-pkgsrc-version-updates branch February 24, 2025 09:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
chore Updating grunt tasks etc; no production code change
Development

Successfully merging this pull request may close these issues.

3 participants