Merge branch 'main' into main

ci/makefile.yml

@@ -0,0 +1,27 @@
+name: Makefile CI
+
+on:
+  push:
+    branches: [ $default-branch ]
+  pull_request:
+    branches: [ $default-branch ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    
+    - name: configure
+      run: ./configure
+      
+    - name: Install dependencies
+      run: make
+      
+    - name: Run check
+      run: make check
+      
+    - name: Run distcheck
+      run: make distcheck

ci/properties/ada.properties.json

@@ -2,5 +2,5 @@
     "name": "Ada",
     "description": "Build Ada project with GPRbuild.",
     "iconName": "ada",
-    "categories": ["Ada"]
+    "categories": ["Continuous integration", "Ada"]
 }

ci/properties/android.properties.json

@@ -2,5 +2,5 @@
     "name": "Android CI",
     "description": "Build an Android project with Gradle.",
     "iconName": "android",
-    "categories": ["Java", "Mobile"]
+    "categories": ["Continuous integration", "Java", "Mobile"]
 }

ci/properties/ant.properties.json

@@ -2,5 +2,5 @@
     "name": "Java with Ant",
     "description": "Build and test a Java project with Apache Ant.",
     "iconName": "ant",
-    "categories": ["Ant", "Java"]
+    "categories": ["Continuous integration", "Ant", "Java"]
 }

ci/properties/c-cpp.properties.json

@@ -2,5 +2,5 @@
     "name": "C/C++ with Make",
     "description": "Build and test a C/C++ project using Make.",
     "iconName": "c-cpp",
-    "categories": ["C", "C++"]
+    "categories": ["Continuous integration", "C", "C++"]
 }

ci/properties/clojure.properties.json

@@ -2,5 +2,5 @@
     "name": "Clojure",
     "description": "Build and test a Clojure project with Leiningen.",
     "iconName": "clojure",
-    "categories": ["Clojure", "Java"]
+    "categories": ["Continuous integration", "Clojure", "Java"]
 }

ci/properties/cmake.properties.json

@@ -2,5 +2,5 @@
     "name": "CMake based projects",
     "description": "Build and test a CMake based project.",
     "iconName": "cmake",
-    "categories": ["C", "C++"]
+    "categories": ["Continuous integration", "C", "C++"]
 }

ci/properties/crystal.properties.json

@@ -2,5 +2,5 @@
     "name": "Crystal",
     "description": "Build and test a Crystal project.",
     "iconName": "crystal",
-    "categories": ["Crystal"]
+    "categories": ["Continuous integration", "Crystal"]
 }

ci/properties/d.properties.json

@@ -2,5 +2,5 @@
     "name": "D",
     "description": "Build and test a D project with dub.",
     "iconName": "d",
-    "categories": [ "D" ]
+    "categories": ["Continuous integration", "D"]
 }

ci/properties/dart.properties.json

@@ -2,5 +2,5 @@
     "name": "Dart",
     "description": "Build and test a Dart project with Pub.",
     "iconName": "dart",
-    "categories": ["Dart"]
+    "categories": ["Continuous integration", "Dart"]
 }

ci/properties/deno.properties.json

@@ -2,5 +2,5 @@
     "name": "Deno",
     "description": "Test your Deno project",
     "iconName": "deno",
-    "categories": ["JavaScript", "TypeScript", "Deno"]
+    "categories": ["Continuous integration", "JavaScript", "TypeScript", "Deno"]
 }

ci/properties/django.properties.json

@@ -2,5 +2,5 @@
     "name": "Django",
     "description": "Build and Test a Django Project",
     "iconName": "django",
-    "categories": ["Python", "Django"]
+    "categories": ["Continuous integration", "Python", "Django"]
 }

ci/properties/docker-image.properties.json

@@ -2,5 +2,5 @@
     "name": "Docker image",
     "description": "Build a Docker image to deploy, run, or push to a registry.",
     "iconName": "docker",
-    "categories": ["Dockerfile"]
+    "categories": ["Continuous integration", "Dockerfile"]
 }

ci/properties/docker-publish.properties.json

@@ -2,5 +2,5 @@
   "name": "Publish Docker Container",
   "description": "Build, test and push Docker image to GitHub Packages.",
   "iconName": "docker",
-  "categories": ["Dockerfile"]
+  "categories": ["Continuous integration", "Dockerfile"]
 }

ci/properties/dotnet-desktop.properties.json

@@ -2,5 +2,5 @@
     "name": ".NET Desktop",
     "description": "Build, test, sign and publish a desktop application built on .NET.",
     "iconName": "dotnet",
-    "categories": ["C#", "Visual Basic", "WPF", ".NET"]
+    "categories": ["Continuous integration", "C#", "Visual Basic", "WPF", ".NET"]
 }

ci/properties/dotnet.properties.json

@@ -2,5 +2,5 @@
     "name": ".NET",
     "description": "Build and test a .NET or ASP.NET Core project.",
     "iconName": "dotnet",
-    "categories": ["C#", "F#", "Visual Basic", "ASP", "ASP.NET", ".NET"]
+    "categories": ["Continuous integration", "C#", "F#", "Visual Basic", "ASP", "ASP.NET", ".NET", "AspNetCore", "DotNetConsole"]
 }

ci/properties/elixir.properties.json

@@ -2,5 +2,5 @@
     "name": "Elixir",
     "description": "Build and test an Elixir project with Mix.",
     "iconName": "elixir",
-    "categories": ["Elixir", "Erlang"]
+    "categories": ["Continuous integration", "Elixir", "Erlang"]
 }

ci/properties/erlang.properties.json

@@ -2,5 +2,5 @@
     "name": "Erlang",
     "description": "Build and test an Erlang project with rebar.",
     "iconName": "erlang",
-    "categories": ["Erlang"]
+    "categories": ["Continuous integration", "Erlang"]
 }

ci/properties/gem-push.properties.json

@@ -2,5 +2,5 @@
     "name": "Ruby Gem",
     "description": "Pushes a Ruby Gem to RubyGems and GitHub Package Registry.",
     "iconName": "ruby-gems",
-    "categories": ["Ruby"]
+    "categories": ["Continuous integration", "Ruby"]
 }

ci/properties/go.properties.json

@@ -2,5 +2,5 @@
     "name": "Go",
     "description": "Build a Go project.",
     "iconName": "go",
-    "categories": ["Go"]
+    "categories": ["Continuous integration", "Go"]
 }

ci/properties/gradle-publish.properties.json

@@ -2,5 +2,5 @@
     "name": "Publish Java Package with Gradle",
     "description": "Build a Java Package using Gradle and publish to GitHub Packages.",
     "iconName": "gradle",
-    "categories": ["Java", "Gradle", "Spring", "JSF"]
+    "categories": ["Continuous integration", "Java", "Gradle", "Spring", "JSF"]
 }

ci/properties/gradle.properties.json

@@ -2,5 +2,5 @@
     "name": "Java with Gradle",
     "description": "Build and test a Java project using a Gradle wrapper script.",
     "iconName": "gradle",
-    "categories": ["Java", "Gradle", "Spring", "JSF"]
+    "categories": ["Continuous integration", "Java", "Gradle", "Spring", "JSF"]
 }

ci/properties/haskell.properties.json

@@ -2,5 +2,5 @@
     "name": "Haskell",
     "description": "Build and test a Haskell project with Cabal.",
     "iconName": "haskell",
-    "categories": ["Haskell"]
+    "categories": ["Continuous integration", "Haskell"]
 }

ci/properties/ios.properties.json

@@ -3,6 +3,7 @@
     "description": "Build and test an iOS application using xcodebuild and any available iPhone simulator.",
     "iconName": "xcode",
     "categories": [
+        "Continuous integration",
         "iOS",
         "Xcode"
     ]

ci/properties/jekyll.properties.json

@@ -2,5 +2,5 @@
     "name": "Jekyll",
     "description": "Package a Jekyll site using the jekyll/builder Docker image.",
     "iconName": "jekyll",
-    "categories": ["HTML"]
+    "categories": ["Continuous integration", "HTML"]
 }

ci/properties/laravel.properties.json

@@ -3,6 +3,7 @@
     "description": "Test a Laravel project.",
     "iconName": "php",
     "categories": [
+        "Continuous integration",
         "PHP",
         "Laravel"
     ]

ci/properties/makefile.properties.json

@@ -0,0 +1,6 @@
+{
+    "name": "Build projects with Make",
+    "description": "Build and test a project using Make.",
+    "iconName": "makefile",
+    "categories": ["Continuous integration", "Makefile"]
+}

ci/properties/maven-publish.properties.json

@@ -2,5 +2,5 @@
     "name": "Publish Java Package with Maven",
     "description": "Build a Java Package using Maven and publish to GitHub Packages.",
     "iconName": "maven",
-    "categories": ["Java", "Maven", "Spring", "JSF"]
+    "categories": ["Continuous integration", "Java", "Maven", "Spring", "JSF"]
 }

ci/properties/maven.properties.json

@@ -2,5 +2,5 @@
     "name": "Java with Maven",
     "description": "Build and test a Java project with Apache Maven.",
     "iconName": "maven",
-    "categories": ["Java", "Maven", "Spring", "JSF"]
+    "categories": ["Continuous integration", "Java", "Maven", "Spring", "JSF"]
 }

ci/properties/msbuild.properties.json

@@ -2,5 +2,5 @@
     "name": "MSBuild based projects",
     "description": "Build a MSBuild based project.",
     "iconName": "c-cpp",
-    "categories": ["C", "C++"]
+    "categories": ["Continuous integration", "C", "C++"]
 }

ci/properties/node.js.properties.json

@@ -2,5 +2,5 @@
     "name": "Node.js",
     "description": "Build and test a Node.js project with npm.",
     "iconName": "nodejs",
-    "categories": ["JavaScript", "npm", "React", "Angular"]
+    "categories": ["Continuous integration", "JavaScript", "npm", "React", "Angular"]
 }

ci/properties/npm-grunt.properties.json

@@ -2,5 +2,5 @@
     "name": "Grunt",
     "description": "Build a NodeJS project with npm and grunt.",
     "iconName": "grunt",
-    "categories": ["JavaScript", "TypeScript", "npm", "Grunt"]
+    "categories": ["Continuous integration", "JavaScript", "TypeScript", "npm", "Grunt"]
 }

ci/properties/npm-gulp.properties.json

@@ -2,5 +2,5 @@
     "name": "Gulp",
     "description": "Build a NodeJS project with npm and gulp.",
     "iconName": "gulp",
-    "categories": ["JavaScript", "TypeScript", "npm", "Gulp"]
+    "categories": ["Continuous integration", "JavaScript", "TypeScript", "npm", "Gulp"]
 }

ci/properties/npm-publish.properties.json

@@ -2,5 +2,5 @@
     "name": "Publish Node.js Package",
     "description": "Publishes a Node.js package to npm and GitHub Packages.",
     "iconName": "node-package-transparent",
-    "categories": ["JavaScript", "npm"]
+    "categories": ["Continuous integration", "JavaScript", "npm"]
 }

ci/properties/php.properties.json

@@ -2,5 +2,5 @@
     "name": "PHP",
     "description": "Build and test a PHP application using Composer",
     "iconName": "php",
-    "categories": ["PHP", "Composer"]
+    "categories": ["Continuous integration", "PHP", "Composer"]
 }

ci/properties/pylint.properties.json

@@ -2,5 +2,5 @@
     "name": "Pylint",
     "description": "Lint a Python application with pylint.",
     "iconName": "python",
-    "categories": ["Python"]
+    "categories": ["Continuous integration", "Python", "Bottle", "Flask"]
 }

ci/properties/python-app.properties.json

@@ -2,5 +2,5 @@
     "name": "Python application",
     "description": "Create and test a Python application.",
     "iconName": "python",
-    "categories": ["Python"]
+    "categories": ["Continuous integration", "Python", "Bottle", "Flask"]
 }

ci/properties/python-package-conda.properties.json

@@ -2,5 +2,5 @@
     "name": "Python Package using Anaconda",
     "description": "Create and test a Python package on multiple Python versions using Anaconda for package management.",
     "iconName": "python",
-    "categories": ["Python"]
+    "categories": ["Continuous integration", "Python"]
 }

ci/properties/python-package.properties.json

@@ -2,5 +2,5 @@
     "name": "Python package",
     "description": "Create and test a Python package on multiple Python versions.",
     "iconName": "python",
-    "categories": ["Python"]
+    "categories": ["Continuous integration", "Python", "Bottle", "Flask"]
 }

ci/properties/python-publish.properties.json

@@ -2,5 +2,5 @@
     "name": "Publish Python Package",
     "description": "Publish a Python Package to PyPI on release.",
     "iconName": "python",
-    "categories": ["Python"]
+    "categories": ["Continuous integration", "Python"]
 }

ci/properties/r.properties.json

@@ -2,5 +2,5 @@
     "name": "R package",
     "description": "Create and test an R package on multiple R versions.",
     "iconName": "r",
-    "categories": ["R"]
+    "categories": ["Continuous integration", "R"]
 }

ci/properties/rails-lint.properties.json

@@ -1,6 +0,0 @@
-{
-    "name": "Rails - Build and Run Linters",
-    "description": "Build Rails application and run linters",
-    "iconName": "ruby",
-    "categories": ["Ruby", "Rails"]
-}

ci/properties/ruby.properties.json

@@ -2,5 +2,5 @@
     "name": "Ruby",
     "description": "Build and test a Ruby project with Rake.",
     "iconName": "ruby",
-    "categories": ["Ruby"]
+    "categories": ["Continuous integration", "Ruby"]
 }

ci/properties/rubyonrails-lint.properties.json

@@ -0,0 +1,6 @@
+{
+    "name": "Rails - Install Dependencies and Run Linters",
+    "description": "Install dependencies and run linters on Rails application",
+    "iconName": "ruby",
+    "categories": ["Continuous integration", "Ruby", "Rails"]
+}

ci/properties/rust.properties.json

@@ -2,5 +2,5 @@
     "name": "Rust",
     "description": "Build and test a Rust project with Cargo.",
     "iconName": "rust",
-    "categories": ["Rust"]
+    "categories": ["Continuous integration", "Rust"]
 }

ci/properties/scala.properties.json

@@ -2,5 +2,5 @@
     "name": "Scala",
     "description": "Build and test a Scala project with SBT.",
     "iconName": "scala",
-    "categories": ["Scala", "Java"]
+    "categories": ["Continuous integration", "Scala", "Java"]
 }

ci/properties/swift.properties.json

@@ -2,5 +2,5 @@
     "name": "Swift",
     "description": "Build and test a Swift Package.",
     "iconName": "swift",
-    "categories": ["Swift"]
+    "categories": ["Continuous integration", "Swift"]
 }

ci/properties/webpack.properties.json

@@ -2,5 +2,5 @@
     "name": "Webpack",
     "description": "Build a NodeJS project with npm and webpack.",
     "iconName": "webpack",
-    "categories": ["JavaScript", "TypeScript", "npm", "Webpack"]
+    "categories": ["Continuous integration", "JavaScript", "TypeScript", "npm", "Webpack"]
 }

ci/rubyonrails-lint.yml

@@ -3,7 +3,7 @@
 # separate terms of service, privacy policy, and support
 # documentation.
 # This workflow will download a prebuilt Ruby version, install dependencies, and  run linters
-name: Build Rails and run linters
+name: Rails - Install dependencies and run linters
 
 on:
   push:
@@ -18,7 +18,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Setup Ruby and install gems
-        uses: ruby/setup-ruby@v1
+        uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
         with:
           bundler-cache: true
       # Add or Replace any other security checks here

deployments/openshift.yml

@@ -3,61 +3,57 @@
 # separate terms of service, privacy policy, and support
 # documentation.
 
-### The OpenShift Starter workflow will:
+# 💁 The OpenShift Starter workflow will:
 # - Checkout your repository
-# - Perform a Docker build
+# - Perform a container image build
-# - Push the built image to an image registry
+# - Push the built image to the GitHub Container Registry (GHCR)
 # - Log in to your OpenShift cluster
-# - Create an OpenShift app from the image and expose it to the internet.
+# - Create an OpenShift app from the image and expose it to the internet
 
-### Before you begin:
+# ℹ️ Configure your repository and the workflow with the following steps:
-# - Have write access to a container image registry such as quay.io or Dockerhub.
+# 1. Have access to an OpenShift cluster. Refer to https://www.openshift.com/try
-# - Have access to an OpenShift cluster.
+# 2. Create the OPENSHIFT_SERVER and OPENSHIFT_TOKEN repository secrets. Refer to:
-#   - For instructions to get started with OpenShift see https://www.openshift.com/try
+#   - https://github.com/redhat-actions/oc-login#readme
-# - The project you wish to add this workflow to should have a Dockerfile.
+#   - https://docs.github.com/en/actions/reference/encrypted-secrets
-#   - If you don't have a Dockerfile at the repository root, see the buildah-build step.
+#   - https://cli.github.com/manual/gh_secret_set
-#   - Builds from scratch are also available, but require more configuration.
+# 3. (Optional) Edit the top-level 'env' section as marked with '🖊️' if the defaults are not suitable for your project.
+# 4. (Optional) Edit the build-image step to build your project.
+#    The default build type is by using a Dockerfile at the root of the repository,
+#    but can be replaced with a different file, a source-to-image build, or a step-by-step buildah build.
+# 5. Commit and push the workflow file to your default branch to trigger a workflow run.
 
-### To get the workflow running:
+# 👋 Visit our GitHub organization at https://github.com/redhat-actions/ to see our actions and provide feedback.
-# 1. Add this workflow to your repository.
-# 2. Edit the top-level 'env' section, which contains a list of environment variables that must be configured.
-# 3. Create the secrets referenced in the 'env' section under your repository Settings.
-# 4. Edit the 'branches' in the 'on' section to trigger the workflow on a push to your branch.
-# 5. Commit and push your changes.
-
-# For a more sophisticated example, see https://github.com/redhat-actions/spring-petclinic/blob/main/.github/workflows/petclinic-sample.yaml
-# Also see our GitHub organization, https://github.com/redhat-actions/
-# ▶️ See a video of how to set up this workflow at https://www.youtube.com/watch?v=6hgBO-1pKho
 
 name: OpenShift
 
-# ⬇️  Modify the fields marked with ⬇️ to fit your project, and create any secrets that are referenced.
-# https://docs.github.com/en/free-pro-team@latest/actions/reference/encrypted-secrets
 env:
-  # ⬇️ EDIT with your registry and registry path.
+  # 🖊️ EDIT your repository secrets to log into your OpenShift cluster and set up the context.
-  REGISTRY: quay.io/<username>
-  # ⬇️ EDIT with your registry username.
-  REGISTRY_USER: <username>
-  REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
-
-  # ⬇️ EDIT to log into your OpenShift cluster and set up the context.
   # See https://github.com/redhat-actions/oc-login#readme for how to retrieve these values.
+  # To get a permanent token, refer to https://github.com/redhat-actions/oc-login/wiki/Using-a-Service-Account-for-GitHub-Actions
   OPENSHIFT_SERVER: ${{ secrets.OPENSHIFT_SERVER }}
   OPENSHIFT_TOKEN: ${{ secrets.OPENSHIFT_TOKEN }}
-
+  # 🖊️ EDIT to set the kube context's namespace after login. Leave blank to use your user's default namespace.
-  # ⬇️ EDIT with any additional port your application should expose.
-  # By default, oc new-app action creates a service to the image's lowest numeric exposed port.
-  APP_PORT: ""
-
-  # ⬇️ EDIT if you wish to set the kube context's namespace after login. Leave blank to use the default namespace.
   OPENSHIFT_NAMESPACE: ""
 
-  # If you wish to manually provide the APP_NAME and TAG, set them here, otherwise they will be auto-detected.
+  # 🖊️ EDIT to set a name for your OpenShift app, or a default one will be generated below.
   APP_NAME: ""
-  TAG: ""
+
+  # 🖊️ EDIT with the port your application should be accessible on.
+  # If the container image exposes *exactly one* port, this can be left blank.
+  # Refer to the 'port' input of https://github.com/redhat-actions/oc-new-app
+  APP_PORT: ""
+
+  # 🖊️ EDIT to change the image registry settings.
+  # Registries such as GHCR, Quay.io, and Docker Hub are supported.
+  IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }}
+  IMAGE_REGISTRY_USER: ${{ github.actor }}
+  IMAGE_REGISTRY_PASSWORD: ${{ github.token }}
+
+  # 🖊️ EDIT to specify custom tags for the container image, or default tags will be generated below.
+  IMAGE_TAGS: ""
 
 on:
-  # https://docs.github.com/en/free-pro-team@latest/actions/reference/events-that-trigger-workflows
+  # https://docs.github.com/en/actions/reference/events-that-trigger-workflows
   push:
     # Edit to the branch(es) you want to build and deploy on each push.
     branches: [ $default-branch ]
@@ -65,32 +61,40 @@ on:
 jobs:
   openshift-ci-cd:
     name: Build and deploy to OpenShift
+    # ubuntu-20.04 can also be used.
     runs-on: ubuntu-18.04
     environment: production
 
     outputs:
-        ROUTE: ${{ steps.deploy-and-expose.outputs.route }}
+      ROUTE: ${{ steps.deploy-and-expose.outputs.route }}
-        SELECTOR: ${{ steps.deploy-and-expose.outputs.selector }}
+      SELECTOR: ${{ steps.deploy-and-expose.outputs.selector }}
 
     steps:
-    - name: Check if secrets exists
+    - name: Check for required secrets
-      uses: actions/github-script@v3
+      uses: actions/github-script@v4
       with:
         script: |
           const secrets = {
-            REGISTRY_PASSWORD: `${{ secrets.REGISTRY_PASSWORD }}`,
             OPENSHIFT_SERVER: `${{ secrets.OPENSHIFT_SERVER }}`,
             OPENSHIFT_TOKEN: `${{ secrets.OPENSHIFT_TOKEN }}`,
           };
 
+          const GHCR = "ghcr.io";
+          if (`${{ env.IMAGE_REGISTRY }}`.startsWith(GHCR)) {
+            core.info(`Image registry is ${GHCR} - no registry password required`);
+          }
+          else {
+            core.info("A registry password is required");
+            secrets["IMAGE_REGISTRY_PASSWORD"] = `${{ secrets.IMAGE_REGISTRY_PASSWORD }}`;
+          }
+
           const missingSecrets = Object.entries(secrets).filter(([ name, value ]) => {
             if (value.length === 0) {
-              core.warning(`Secret "${name}" is not set`);
+              core.error(`Secret "${name}" is not set`);
               return true;
             }
             core.info(`✔️ Secret "${name}" is set`);
             return false;
-
           });
 
           if (missingSecrets.length > 0) {
@@ -104,48 +108,50 @@ jobs:
             core.info(`✅ All the required secrets are set`);
           }
 
-    - uses: actions/checkout@v2
+    - name: Check out repository
+      uses: actions/checkout@v2
 
     - name: Determine app name
       if: env.APP_NAME == ''
       run: |
         echo "APP_NAME=$(basename $PWD)" | tee -a $GITHUB_ENV
 
-    - name: Determine tag
+    - name: Determine image tags
-      if: env.TAG == ''
+      if: env.IMAGE_TAGS == ''
       run: |
-        echo "TAG=${GITHUB_SHA::7}" | tee -a $GITHUB_ENV
+        echo "IMAGE_TAGS=latest ${GITHUB_SHA::12}" | tee -a $GITHUB_ENV
 
     # https://github.com/redhat-actions/buildah-build#readme
     - name: Build from Dockerfile
-      id: image-build
+      id: build-image
       uses: redhat-actions/buildah-build@v2
       with:
         image: ${{ env.APP_NAME }}
-        tags: ${{ env.TAG }}
+        tags: ${{ env.IMAGE_TAGS }}
-        # If you don't have a dockerfile, see:
+
-        # https://github.com/redhat-actions/buildah-build#scratch-build-inputs
+        # If you don't have a Dockerfile/Containerfile, refer to https://github.com/redhat-actions/buildah-build#scratch-build-inputs
-        # Otherwise, point this to your Dockerfile relative to the repository root.
+        # Or, perform a source-to-image build using https://github.com/redhat-actions/s2i-build
+        # Otherwise, point this to your Dockerfile/Containerfile relative to the repository root.
         dockerfiles: |
           ./Dockerfile
 
     # https://github.com/redhat-actions/push-to-registry#readme
     - name: Push to registry
-      id: push-to-registry
+      id: push-image
       uses: redhat-actions/push-to-registry@v2
       with:
-        image: ${{ steps.image-build.outputs.image }}
+        image: ${{ steps.build-image.outputs.image }}
-        tags: ${{ steps.image-build.outputs.tags }}
+        tags: ${{ steps.build-image.outputs.tags }}
-        registry: ${{ env.REGISTRY }}
+        registry: ${{ env.IMAGE_REGISTRY }}
-        username: ${{ env.REGISTRY_USER }}
+        username: ${{ env.IMAGE_REGISTRY_USER }}
-        password: ${{ env.REGISTRY_PASSWORD }}
+        password: ${{ env.IMAGE_REGISTRY_PASSWORD }}
 
-    # The path the image was pushed to is now stored in ${{ steps.push-to-registry.outputs.registry-path }}
+    # The path the image was pushed to is now stored in ${{ steps.push-image.outputs.registry-path }}
 
-    # oc-login works on all platforms, but oc must be installed first.
+    - name: Install oc
-    # The GitHub Ubuntu runner already includes oc.
+      uses: redhat-actions/openshift-tools-installer@v1
-    # Otherwise, https://github.com/redhat-actions/openshift-tools-installer can be used to install oc,
+      with:
-    # as well as many other tools.
+        oc: 4
 
     # https://github.com/redhat-actions/oc-login#readme
     - name: Log in to OpenShift
@@ -163,18 +169,19 @@ jobs:
       uses: redhat-actions/oc-new-app@v1
       with:
         app_name: ${{ env.APP_NAME }}
-        image: ${{ steps.push-to-registry.outputs.registry-path }}
+        image: ${{ steps.push-image.outputs.registry-path }}
         namespace: ${{ env.OPENSHIFT_NAMESPACE }}
         port: ${{ env.APP_PORT }}
 
-    - name: View application route
+    - name: Print application URL
+      env:
+        ROUTE: ${{ steps.deploy-and-expose.outputs.route }}
+        SELECTOR: ${{ steps.deploy-and-expose.outputs.selector }}
       run: |
         [[ -n ${{ env.ROUTE }} ]] || (echo "Determining application route failed in previous step"; exit 1)
+        echo
         echo "======================== Your application is available at: ========================"
         echo ${{ env.ROUTE }}
         echo "==================================================================================="
         echo
         echo "Your app can be taken down with: \"oc delete all --selector='${{ env.SELECTOR }}'\""
-      env:
-        ROUTE: ${{ steps.deploy-and-expose.outputs.route }}
-        SELECTOR: ${{ steps.deploy-and-expose.outputs.selector }}

deployments/properties/openshift.properties.json

@@ -3,5 +3,5 @@
     "description": "Build a Docker-based project and deploy it to OpenShift.",
     "creator": "Red Hat",
     "iconName": "openshift",
-    "categories": ["Dockerfile","Deployment" ]
+    "categories": ["Deployment", "Dockerfile"]
 }

icons/makefile.svg

@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M3.403 2.47a2.06 2.06 0 0 0-2.06 2.06v12.364a2.06 2.06 0 0 0 2.06 2.06h7.983l1.758 1.654a.31.31 0 0 0 .399.02l1.27-1.024c.388.148.768.227 1.166.266l.687 1.489a.305.305 0 0 0 .362.157l2.334-.704a.308.308 0 0 0 .215-.335l-.245-1.62c.151-.125.296-.255.434-.402.138-.147.262-.307.387-.475l1.62.157a.31.31 0 0 0 .321-.235l.554-2.374a.3.3 0 0 0-.18-.353l-1.525-.595a4.416 4.416 0 0 0-.342-1.141l.942-1.334a.31.31 0 0 0-.046-.397l-1.61-1.509V4.531a2.06 2.06 0 0 0-2.06-2.06zm0 4.121h14.423v4.383c-.31-.1-.62-.168-.94-.204l-.69-1.483a.301.301 0 0 0-.364-.156l-2.334.704a.301.301 0 0 0-.215.334l.26 1.606c-.16.134-.312.27-.45.416a4.743 4.743 0 0 0-.374.46l-1.631-.142a.3.3 0 0 0-.32.235l-.556 2.375a.306.306 0 0 0 .18.352l1.529.59c.046.285.123.56.221.833H3.403zm12.991 6.596a2.136 2.136 0 0 1 1.497.578 2.136 2.136 0 0 1 .097 3.02 2.136 2.136 0 0 1-3.018.094 2.136 2.136 0 0 1-.097-3.018 2.136 2.136 0 0 1 1.521-.674z" style="fill:#ef5350;stroke-width:1.0302"/></svg>