Merge branch 'cad/test-suite' of github.com:replit/upm into cad/yarn-…

…tests

.gitignore

@@ -1,6 +1,5 @@
 /cmd/upm/upm
 /dist/
-statik/
 /packaging/aur/*.tar.gz
 /packaging/aur/*.tar.xz
 /packaging/aur/pkg/

.semaphore/install_nix.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/env sh
+
+set -e
+set -o xtrace
+
+install_script_cache_key="install-nix-2.16.1"
+install_script="/tmp/$install_script_cache_key"
+
+# Install Nix. Install the base version if the currently installed version is
+# not what we expect.
+if [ \
+	! -f ~/.nix-profile/etc/profile.d/nix.sh -o \
+	"$(~/.nix-profile/bin/nix --version)" != "nix (Nix) 2.16.1" \
+	]; then
+	curl -L https://releases.nixos.org/nix/nix-2.16.1/install | sh
+fi
+
+source ~/.nix-profile/etc/profile.d/nix.sh
+
+set +e

.semaphore/semaphore.yml

@@ -3,64 +3,46 @@ version: v1.0
 name: UPM
 agent:
   machine:
-    type: e1-standard-2
-
-  containers:
-    - name: main
-      image: gcr.io/marine-cycle-160323/nix@sha256:98a129684f9a4a15f1148c51f9769a9208dc4f34b823396100c5f67610b7fe1f
-
-  image_pull_secrets:
-    - name: upm-gcr-pull-secrets
+    type: s1-goval
 
 global_job_config:
   prologue:
     commands:
       - checkout
       - git switch --detach
       - export PATH="/tmp:$PATH"
+      - source ./.semaphore/install_nix.sh
 
 blocks:
-  - name: setup
-    dependencies: []
-    task:
-      jobs:
-        - name: cache golint-ci
-          commands:
-            - >-
-              cache has_key golangci-lint || (
-              mkdir -p bin &&
-              curl
-              -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh
-              | sh -s -- -b /tmp v1.52.2
-              && cache store golangci-lint /tmp/golangci-lint
-              )
-
   - name: build
-    dependencies: [ setup ]
+    dependencies: [ ]
     task:
       jobs:
         - name: nix
           commands:
-            # - cache restore nix-store
             - nix build
             - ./result/bin/upm --version
-            - cache store nix-store /nix
 
   - name: test
-    dependencies: [ build, setup ]
+    dependencies: [ build ]
     task:
       jobs:
         - name: test-suite
           commands:
-            - nix develop -c make generated
-            - nix develop -c nix shell -c go test ./test-suite
+            - nix develop -c nix shell -c make ci-test-suite
+      epilogue:
+        commands:
+          - test-results publish junit.xml
 
   - name: lint
-    dependencies: [ setup ]
+    dependencies: [ ]
     task:
       jobs:
         - name: golang lint
           commands:
             - make generated
             - cache restore golangci-lint
-            - golangci-lint run
+            - >-
+              curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh
+              | sh -s -- -b /tmp v1.52.2
+            - /tmp/golangci-lint run

Makefile

@@ -80,3 +80,8 @@ help: ## Show this message
 .PHONY: test
 test:
 	go test ./... -v
+
+.PHONY: ci-test-suite
+ci-test-suite:
+	go get gotest.tools/gotestsum
+	go run gotest.tools/gotestsum --junitfile ./junit.xml ./test-suite