Merge pull request #105 from OpenVoxProject/dep_updates

Update dependencies

Author: bastelfreak

.github/workflows/pr-testing.yml

@@ -49,7 +49,7 @@ jobs:
         run: ./dev-setup
       - name: clojure tests
         run: lein -U ${{ matrix.javaargs }} test ${{ matrix.filter }}
-        timeout-minutes: 30
+        timeout-minutes: 120
 
   rspec-tests:
     name: Rspec Tests - Java ${{ matrix.java }} Ruby ${{ matrix.ruby }}

.github/workflows/release.yaml

@@ -1,26 +1,18 @@
 ---
-name: Release
+name: Release and publish package to clojars.org
+
+permissions:
+  contents: write
+  packages: write
 
 on:
-  push:
-    tags:
-      - '*'
+  workflow_dispatch:
 
 jobs:
   release:
-    name: Release
-    runs-on: ubuntu-24.04
-    # Optional but recommended to use a specific environment
-    environment: release
-    # Prevent releases from forked repositories
-    if: github.repository_owner == 'OpenVoxProject' && !startsWith(github.ref_name, '99.')
-
-    permissions:
-      contents: write
-
-    steps:
-      - name: Create Release Page
-        shell: bash
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: gh release create  --repo ${{ github.repository }} ${{ github.ref_name }} --generate-notes
+    uses: 'openvoxproject/shared-actions/.github/workflows/clojure_release.yml@main'
+    secrets:
+      github_pat: ${{ secrets.OPENVOXBOT_COMMIT_AND_PRS }}
+      ssh_private_key: ${{ secrets.OPENVOXBOT_SSH_PRIVATE_KEY }}
+      clojars_username: ${{ secrets.CLOJARS_USERNAME }}
+      clojars_password: ${{ secrets.CLOJARS_PASSWORD }}

project.clj

@@ -23,7 +23,7 @@
 
   :min-lein-version "2.9.1"
 
-  :parent-project {:coords [org.openvoxproject/clj-parent "7.5.1"]
+  :parent-project {:coords [org.openvoxproject/clj-parent "7.6.4"]
                    :inherit [:managed-dependencies]}
 
   :dependencies [[org.clojure/clojure]
@@ -83,8 +83,7 @@
             [jonase/eastwood "1.4.3" :exclusions [org.clojure/clojure]]
             ;; We have to have this, and it needs to agree with clj-parent
             ;; until/unless you can have managed plugin dependencies.
-            [org.openvoxproject/i18n "0.9.4" :hooks false]]
-
+            [org.openvoxproject/i18n "1.0.2" :hooks false]]
   :uberjar-name "puppet-server-release.jar"
   :lein-ezbake {:vars {:user "puppet"
                        :group "puppet"
@@ -133,10 +132,6 @@
                                                            {:major major
                                                             :minor minor})]
                                       (condp = (java.lang.Integer/parseInt major)
-                                        1 (if (= 8 (java.lang.Integer/parseInt minor))
-                                            ["-Djava.security.properties==./dev-resources/java.security.jdk8-fips"]
-                                            (throw unsupported-ex))
-                                        11 ["-Djava.security.properties==./dev-resources/java.security.jdk11on-fips"]
                                         17 ["-Djava.security.properties==./dev-resources/java.security.jdk11on-fips"]
                                         21 ["-Djava.security.properties==./dev-resources/java.security.jdk11on-fips"]
                                         (do)))}
@@ -150,7 +145,7 @@
                     ;; use core.async and need more than eight threads to run
                     ;; properly; this setting overrides the default value.  Without
                     ;; it the metrics tests will hang.
-                    :jvm-opts ["-Dclojure.core.async.pool-size=50"]
+                    :jvm-opts ["-Dclojure.core.async.pool-size=50", "-Xms4g", "-Xmx4g"]
                     ;; Use humane test output so you can actually see what the problem is
                     ;; when a test fails.
                     :dependencies [[pjstadig/humane-test-output "0.11.0"]]

tasks/build.rake

@@ -31,11 +31,11 @@ DEP_BUILD_ORDER = [
   'jruby-deps',
   'trapperkeeper',
   'trapperkeeper-filesystem-watcher',
+  'clj-http-client',
   'trapperkeeper-webserver-jetty10',
   'ring-middleware',
   'jruby-utils',
   'clj-shell-utils',
-  'clj-http-client',
   'dujour-version-check',
   'clj-rbac-client',
   'trapperkeeper-authorization',
@@ -140,7 +140,7 @@ namespace :vox do
       fips = !ENV['FIPS'].nil?
       puts "Building openvox-server"
       ezbake_version_var = ENV['EZBAKE_VERSION'] ? "EZBAKE_VERSION=#{ENV['EZBAKE_VERSION']}" : ''
-      run("cd /code && rm -rf ruby && rm -rf output && bundle install --without test && lein install")
+      run("cd /code && rm -rf output && bundle install --without test && lein install")
       run("cd /code && COW=\"#{@debs}\" MOCK=\"#{@rpms}\" GEM_SOURCE='https://rubygems.org' #{ezbake_version_var} EZBAKE_ALLOW_UNREPRODUCIBLE_BUILDS=true EZBAKE_NODEPLOY=true LEIN_PROFILES=ezbake lein with-profile #{fips ? 'fips,' : ''}user,ezbake,provided,internal ezbake local-build")
       run_command("sudo chown -R $USER output", print_command: true)
       Dir.glob('output/**/*i386*').each { |f| FileUtils.rm_rf(f) }