Merge pull request #16 from signalsciences/BuildOnGithubActions

Build on GitHub actions

Author: jhanrahan-sigsci

.github/workflows/go.yml renamed to .github/workflows/build.yml

@@ -1,7 +1,7 @@
 name: sigsci-module-golang
 on:
   push:
-    branches: [ BuildOnGithubActions ]
+    branches: [ master ]
 
 jobs:
   build:
@@ -15,13 +15,9 @@ jobs:
         aws-region: us-west-2
     - name: Check out code into the Go module directory
       uses: actions/checkout@v2
-    - name: Set up Go 1.12
-      uses: actions/setup-go@v1
-      with:
-        go-version: 1.12
-      id: go
     - name: Run make script
       run: |
+        $(aws ecr get-login --registry-ids 803688608479 --region us-west-2 --no-include-email)
         ./make.sh
       env:
         PROD_ID: ${{ secrets.SIGSCI_PROD_CANONICAL_ID }}

make-jenkins.sh

@@ -0,0 +1,59 @@
+#!/bin/sh
+
+set -ex
+
+# build / lint agent in a container
+find . -name "goroot" -type d | xargs rm -rf
+mkdir goroot
+
+
+docker build -f Dockerfile.git -t golang-git:1.10.6-alpine3.8 .
+docker run --user $(id -u ${USER}):$(id -g ${USER}) -v ${PWD}/goroot:/go/ --rm golang-git:1.10.6-alpine3.8 /bin/sh -c 'go get github.com/signalsciences/tlstext && go get github.com/tinylib/msgp && go get github.com/alecthomas/gometalinter'
+./scripts/build-docker.sh
+
+# run module tests
+./scripts/test.sh
+
+
+BASE=$PWD
+## setup our package properties by distro
+PKG_NAME="sigsci-module-golang"
+DEST_BUCKET="package-build-artifacts"
+DEST_KEY="${PKG_NAME}/${GITHUB_RUN_NUMBER}"
+VERSION=$(cat ./VERSION)
+
+
+cd ${BASE}
+echo "DONE"
+
+# Main package
+aws s3api put-object \
+  --bucket "${DEST_BUCKET}" \
+  --cache-control="max-age=300" \
+  --content-type="application/octet-stream" \
+  --body "./artifacts/${PKG_NAME}.tar.gz" \
+  --key "${DEST_KEY}/${PKG_NAME}_${VERSION}.tar.gz" \
+  --grant-full-control id="${PROD_ID}"
+
+# Metadata files
+aws s3api put-object \
+  --bucket "${DEST_BUCKET}" \
+  --cache-control="max-age=300" \
+  --content-type="text/plain; charset=UTF-8" \
+  --body "VERSION" \
+  --key "${DEST_KEY}/VERSION" \
+  --grant-full-control id="${PROD_ID}"
+
+aws s3api put-object \
+  --bucket "${DEST_BUCKET}" \
+  --cache-control="max-age=300" \
+  --content-type="text/plain; charset=UTF-8" \
+  --body "CHANGELOG.md" \
+  --key "${DEST_KEY}/CHANGELOG.md" \
+  --grant-full-control id="${PROD_ID}"
+
+
+
+
+
+

make.sh

@@ -2,5 +2,7 @@
 
 docker build -t foo  .
 
+
+
 rm -rf goroot
 docker run -v ${PWD}:/go/src/github.com/signalsciences/sigsci-module-golang --rm foo ./scripts/build.sh

scripts/build-docker.sh

@@ -21,7 +21,7 @@ services:
 
   # agent
   agent:
-    image: local-dev/sigsci-agent:latest
+    image: 803688608479.dkr.ecr.us-west-2.amazonaws.com/local-dev/sigsci-agent:latest
     command: [ "-debug-log-web-inputs", "2", "-rpc-address", "9090", "-debug-rpc-test-harness", "-debug-standalone", "3" ]
     expose:
       - "9090"
@@ -31,7 +31,7 @@ services:
 
   # punching bag
   punchingbag:
-    image: local-dev/module-testing:latest
+    image: 803688608479.dkr.ecr.us-west-2.amazonaws.com/local-dev/module-testing:latest
     networks:
       - mtest
     expose:
@@ -41,7 +41,7 @@ services:
   # mtest
   #
   mtest:
-    image: local-dev/module-testing:latest
+    image: 803688608479.dkr.ecr.us-west-2.amazonaws.com/local-dev/module-testing:latest
     networks:
       - mtest
     depends_on:
@@ -55,3 +55,4 @@ services:
       - MTEST_AGENT=agent:12345
     command: [ "/bin/wait-for", "web:8085", "--", "/bin/mtest", "-test.v" ]
 
+

scripts/test-golang110/docker-compose.yml

@@ -1,5 +1,5 @@
 #!/bin/bash
-set -e
+set -ex
 
 DOCKERCOMPOSE="docker-compose"
 
@@ -20,16 +20,14 @@ cleanup() {
 }
 trap cleanup 0 1 2 3 6
 
-set -x
-
 # attempt to clean up any leftover junk
 $DOCKERCOMPOSE down
 
 $DOCKERCOMPOSE pull --ignore-pull-failures
 
 # start everything, run tests
 #
-# --no-color --> safe for jenkins
+# --no-color --> safe for ci
 # --build    --> alway build test server/module container
 # --abort-on-container-exit --> without this, the other servers keep the process running
 # --exit-code-from mtest -->  make exit code be the result of module test
@@ -41,5 +39,6 @@ if [ -d "goroot" ]; then
     rm -rf goroot
 fi
 docker run -v ${PWD}/goroot:/go/ --rm golang:1.10.6-alpine3.8 /bin/sh -c 'apk --update add git && go get github.com/signalsciences/tlstext && go get github.com/tinylib/msgp && go get github.com/alecthomas/gometalinter'
+
 $DOCKERCOMPOSE up --no-color --build  --abort-on-container-exit --exit-code-from mtest > /dev/null
 

scripts/test-golang110/test.sh

@@ -21,7 +21,7 @@ services:
 
   # agent
   agent:
-    image: local-dev/sigsci-agent:latest
+    image: 803688608479.dkr.ecr.us-west-2.amazonaws.com/local-dev/sigsci-agent:latest
     command: [ "-debug-log-web-inputs", "2", "-rpc-address", "9090", "-debug-rpc-test-harness", "-debug-standalone", "3" ]
     expose:
       - "9090"
@@ -31,7 +31,7 @@ services:
 
   # punching bag
   punchingbag:
-    image: local-dev/module-testing:latest
+    image: 803688608479.dkr.ecr.us-west-2.amazonaws.com/local-dev/module-testing:latest
     networks:
       - mtest
     expose:
@@ -41,7 +41,7 @@ services:
   # mtest
   #
   mtest:
-    image: local-dev/module-testing:latest
+    image: 803688608479.dkr.ecr.us-west-2.amazonaws.com/local-dev/module-testing:latest
     networks:
       - mtest
     depends_on:

scripts/test-golang111/docker-compose.yml

@@ -29,7 +29,7 @@ $DOCKERCOMPOSE pull --ignore-pull-failures
 
 # start everything, run tests
 #
-# --no-color --> safe for jenkins
+# --no-color --> safe for ci
 # --build    --> alway build test server/module container
 # --abort-on-container-exit --> without this, the other servers keep the process running
 # --exit-code-from mtest -->  make exit code be the result of module test