MISC fixes

zeroc-ice · Feb 13, 2025 · 81fe09b · 81fe09b
1 parent cf5b9e7
commit 81fe09b
Show file tree

Hide file tree

Showing 8 changed files with 59 additions and 5 deletions.
diff --git a/.github/workflows/build-nightly-release-workflow.yml b/.github/workflows/build-nightly-release-workflow.yml
@@ -10,7 +10,7 @@ on:
       repository_url:
         description: "URL of the repository to publish to"
         required: false
-        default: "https://download.zeroc.com/nexus/"
+        default: "https://download.zeroc.com/nexus/repository"
 
 jobs:
   set-version:

diff --git a/.github/workflows/build-npm-packages.yml b/.github/workflows/build-npm-packages.yml
@@ -105,8 +105,7 @@ jobs:
 
       - name: Update Version
         working-directory: ice/js
-        run: |
-          sed -i 's/"version":.*/"version": "${{ inputs.ice_version }}"/' package.json
+        run: npm version ${{ inputs.ice_version }}
         if: inputs.ice_version != ''
 
       - name: Pack npm

diff --git a/.github/workflows/build-pip-packages.yml b/.github/workflows/build-pip-packages.yml
@@ -48,7 +48,6 @@ jobs:
           python3 -m pip install toml
 
       - name: Update PYPI Version
-        working-directory: python
         run: python3 packaging/pypi/update_version.py ${{ inputs.ice_version }} python/pyproject.toml
         if: inputs.ice_version != ''
 

diff --git a/.github/workflows/build-xcframework-packages.yml b/.github/workflows/build-xcframework-packages.yml
@@ -17,6 +17,7 @@ jobs:
 
       - name: Build XCFramework Packages
         run: make OPTIMIZE=yes PLATFORMS="all" CONFIGS="static" srcs
+        working-directory: cpp
 
       - name: Upload Artifacts
         uses: actions/upload-artifact@v4

diff --git a/csharp/msbuild/ice.proj b/csharp/msbuild/ice.proj
@@ -9,7 +9,7 @@
 
     <Import Project="$(MSBuildThisFileDirectory)\..\..\config\icebuilder.props" />
     <PropertyGroup>
-        <PackageVersion Condition="'$(PackageVersion)' = ''">$(IceJSONVersion)</PackageVersion>
+        <PackageVersion Condition="'$(PackageVersion)' == ''">$(IceJSONVersion)</PackageVersion>
     </PropertyGroup>
 
     <Import Project="$(MSBuildThisFileDirectory)\..\..\config\ice.common.targets" />

diff --git a/packaging/rpm/glacier2router.service b/packaging/rpm/glacier2router.service
@@ -0,0 +1,18 @@
+# Copyright (c) ZeroC, Inc.
+
+[Unit]
+Description=Glacier2 router daemon
+Documentation=man:glacier2router(1)
+Documentation=https://doc.zeroc.com/ice/latest/ice-services/glacier2
+After=syslog.target network.target
+
+[Service]
+ExecStart=/usr/bin/glacier2router --Ice.Config=/etc/glacier2router.conf
+Type=notify
+NotifyAccess=main
+RuntimeDirectory=glacier2router
+KillMode=process
+User=ice
+
+[Install]
+WantedBy=multi-user.target
diff --git a/packaging/rpm/icegridnode.service b/packaging/rpm/icegridnode.service
@@ -0,0 +1,18 @@
+# Copyright (c) ZeroC, Inc.
+
+[Unit]
+Description=IceGrid node daemon
+Documentation=man:icegridnode(1)
+Documentation=https://doc.zeroc.com/ice/latest/ice-services/icegrid/icegrid-server-reference/icegridnode
+After=syslog.target network.target icegridregistry.service
+
+[Service]
+ExecStart=/usr/bin/icegridnode --Ice.Config=/etc/icegridnode.conf
+Type=notify
+NotifyAccess=main
+RuntimeDirectory=icegridnode
+KillMode=process
+User=ice
+
+[Install]
+WantedBy=multi-user.target
diff --git a/packaging/rpm/icegridregistry.service b/packaging/rpm/icegridregistry.service
@@ -0,0 +1,19 @@
+# Copyright (c) ZeroC, Inc.
+
+[Unit]
+Description=IceGrid registry daemon
+Documentation=man:icegridregistry(1)
+Documentation=https://doc.zeroc.com/ice/latest/ice-services/icegrid/icegrid-server-reference/icegridregistry
+Before=icegridnode.service
+After=syslog.target network.target
+
+[Service]
+ExecStart=/usr/bin/icegridregistry --Ice.Config=/etc/icegridregistry.conf
+Type=notify
+NotifyAccess=main
+RuntimeDirectory=icegridregistry
+KillMode=process
+User=ice
+
+[Install]
+WantedBy=multi-user.target