Merge branch 'main' into release/0.11

loicrouchon · Jan 1, 2024 · f8acd39 · f8acd39
2 parents a008494 + 834e425
commit f8acd39
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -90,7 +90,7 @@ jobs:
                 uses: jreleaser/release-action@v2
                 with:
                     version: 1.9.0
-                    arguments: release
+                    arguments: full-release
                 env:
                     JRELEASER_PROJECT_VERSION: ${{ steps.read-version.outputs.version }}
                     JRELEASER_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/tools/packaging/fedora/build-from-spec.sh b/tools/packaging/fedora/build-from-spec.sh
@@ -2,7 +2,7 @@
 set -e
 set -x
 
-VERSION="0.11.0r"
+VERSION="0.11.2"
 
 DIR=$(dirname "$0")
 ROOT_DIR="$DIR/../../.."
@@ -32,7 +32,7 @@ cd ~
 rm -rf ~/rpmbuild
 rpmdev-setuptree
 
-sed "s/\${version}/$VERSION/" < "$ROOT_DIR/src/jreleaser/distributions/rpm-spec/symly.spec" > $SPEC
+sed "s/\${version}/$VERSION/" < "$ROOT_DIR/tools/packaging/fedora/symly.spec" > $SPEC
 #cat "$ROOT_DIR/src/jreleaser/distributions/rpm-spec/symly.spec" | sed "s/\${version}/$VERSION/" > $SPEC
 cp "$ROOT_DIR/.wip/symly-${VERSION}.tar.gz" "rpmbuild/SOURCES/v${VERSION}.tar.gz"