Move to cimg/orb 0.6.5 and feed with the newer way (#58)

* Move to cimg/orb 0.6.5 and feed with the newer way

* Update submodule

* Fix issues with feed, add temp-versions to build clojure 1.11.2

* Add java 21

Author: marboledacci

.circleci/config.yml

@@ -1,10 +1,27 @@
 version: 2.1
 
 orbs:
-  cimg: circleci/[email protected]
+  cimg: circleci/[email protected]
+
+parameters:
+  cron:
+    type: boolean
+    default: false
 
 workflows:
+  automated-wf:
+      when: << pipeline.parameters.cron >>
+      jobs:
+        - cimg/update:
+            update-script: clojureFeed.sh
+            context:
+              - slack-notification-access-token
+              - slack-cimg-notifications
+              - cpe-image-bot-github-creds
+
   main-wf:
+    when:
+      not: << pipeline.parameters.cron >>
     jobs:
       - cimg/build-and-deploy:
           name: "Test"

Dockerfile.template

@@ -10,12 +10,12 @@ ENV CLOJURE_VERSION=%%VERSION_FULL%% \
 # Setup the primary install method for Clojure, using CLJ. It unfortunately
 # requires the Clojure version as well as the build number (?), thus a
 # parameter (param1) is used.
-RUN curl -sSL -o clojure-installer.sh "https://download.clojure.org/install/linux-install-%%PARAM1%%.sh" && \
+RUN curl -sSL -o clojure-installer.sh "https://github.com/clojure/brew-install/releases/download/%%VERSION_FULL%%.%%PARAM1%%/linux-install.sh" && \
 	chmod +x clojure-installer.sh && \
 	sudo ./clojure-installer.sh && \
 	rm clojure-installer.sh
 
-ENV LEIN_VERSION=2.10.0
+ENV LEIN_VERSION=2.11.2
 RUN mkdir -p $HOME/bin && \
 	# the above line can go in the next base image update
 	curl -sSL -o $HOME/bin/lein "https://raw.githubusercontent.com/technomancy/leiningen/${LEIN_VERSION}/bin/lein" && \

clojureFeed.sh

@@ -0,0 +1,66 @@
+#!/usr/bin/env bash
+source manifest
+vers=()
+
+if [ -f shared/automated-updates.sh ]; then
+  source shared/automated-updates.sh
+else
+  echo "Check if submodule was loaded; automated-updates.sh is missing"
+  exit 1
+fi
+
+buildParameter () {
+  local newVersionString=$1
+  export builtParam="#$(echo "$newVersionString" | awk -F. '{print $NF}')"
+}
+
+getLeinVersion() {
+  local templateFile=$1
+
+  RSS_URL="https://github.com/technomancy/leiningen/tags.atom"
+  VERSIONS=$(curl --silent "$RSS_URL" | grep -E '(title)' | tail -n +2 | sed -e 's/^[ \t]*//' | sed -e 's/<title>//' -e 's/<\/title>//')
+
+  for version in $VERSIONS; do
+    if [[ $version =~ [0-9]+(\.[0-9]+)*$ ]]; then
+      generateVersions "$version"
+      generateSearchTerms "LEIN_VERSION=" "$templateFile" ""
+      replaceVersions "LEIN_VERSION=" "$SEARCH_TERM" "true"
+    fi
+  done
+}
+
+getClojureVersion() {
+
+  echo "Getting Lein version..."
+  getLeinVersion "Dockerfile.template"
+
+  # RSS_URL="https://github.com/clojure/clojure/tags.atom"
+  # VERSIONS=$(curl --silent "$RSS_URL" | grep -E '(title)' | tail -n +2 | sed -e 's/^[ \t]*//' | sed -e 's/<title>//' -e 's/<\/title>//')
+  VERSIONS=$(cat temp-versions)
+  for version in $VERSIONS; do
+    if [[ $version =~ ^clojure-[0-9]+(\.[0-9]+)*$ ]]; then
+      version_copy="$(cut -d '-' -f2 <<< "$version")"
+      generateVersions "$(cut -d '-' -f2 <<< "$version")"
+      generateSearchTerms "CLOJURE_VERSION=" "$majorMinor/${parentTags[-1]}/Dockerfile" "\\"
+      releaseVersion=$(curl -sSL https://api.github.com/repos/clojure/brew-install/releases | 
+                       jq -r --arg version "$version_copy" 'map(select(.target_commitish == $version)) | sort_by(.created_at) | last | .tag_name')
+      buildParameter "$releaseVersion"
+      directoryCheck "$majorMinor" "$SEARCH_TERM" "$builtParam"
+      if [[ $(eval echo $?) == 0 ]]; then
+        generateVersionString "$newVersion" "$builtParam"
+      fi
+
+    fi
+  done
+}
+
+getClojureVersion
+# vers=($(printf "%s\n" "${vers[@]}" | sort -n))
+if [ -n "${vers[*]}" ]; then
+  echo "Included version updates: ${vers[*]}"
+  echo "Running release script"
+  ./shared/release.sh "${vers[@]}"
+else
+  echo "No new version updates"
+  exit 0
+fi

manifest

@@ -4,6 +4,6 @@ namespace=cimg
 repository=clojure
 parent=openjdk
 variants=(node browsers)
-parentTags=(8.0 11.0 17.0)
+parentTags=(8.0 11.0 17.0 21.0)
 defaultParentTag=17.0
 parentSlug=openjdk

shared

@@ -0,0 +1,11 @@
+clojure-1.12.0
+clojure-1.12.0-rc2
+clojure-1.12.0-rc1
+clojure-1.11.4
+clojure-1.12.0-beta2
+clojure-1.12.0-beta1
+clojure-1.12.0-alpha12
+clojure-1.12.0-alpha11
+clojure-1.12.0-alpha10
+clojure-1.11.3
+clojure-1.11.2