Use the correct Swift in GitHub actions

Author: dkovba

.github/workflows/containerization-build-template.yml

@@ -52,6 +52,7 @@ jobs:
 
       - name: Make containerization and docs
         run: |
+          source /opt/swiftly/env.sh
           make clean containerization docs
           tar cfz _site.tgz _site
         env:

vminitd/Makefile

@@ -23,8 +23,8 @@ SWIFT_SDK_PATH := /tmp/$(notdir $(SWIFT_SDK_URL))
 
 SWIFTLY_URL := https://download.swift.org/swiftly/darwin/swiftly.pkg
 SWIFTLY_FILENAME := $(notdir $(SWIFTLY_URL))
-SWIFTLY_BIN_DIR ?= ~/.swiftly/bin
-SWIFT ?= $(SWIFTLY_BIN_DIR)/swift
+SWIFTLY_BIN_DIR ?= $(HOME)/.swiftly/bin
+SWIFT := $(SWIFTLY_BIN_DIR)/swift
 BUILD_BIN_DIR := $(shell $(SWIFT) build -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION) --show-bin-path)
 
 SYSTEM_TYPE := $(shell uname -s)