Merge pull request GoogleContainerTools#760 from imjasonh/main-actions

Run GitHub Actions on changes to main branch

.github/workflows/buildifier.yaml

@@ -2,7 +2,7 @@ name: Buildifier
 
 on:
   pull_request:
-    branches: [ 'master' ]
+    branches: [ 'main' ]
 
 jobs:
 

.github/workflows/ci.yaml

@@ -1,36 +1,34 @@
 name: CI
 
 on:
+  workflow_dispatch: # Allow manual runs.
   pull_request:
-    branches: [ 'master' ]
+    branches: [ 'main' ]
   push:
-    branches: [ 'master' ]
+    branches: [ 'main' ]
 
 jobs:
   ci:
     name: CI
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/setup-go@v2
-      with:
-        go-version: 1.15.x
     - uses: actions/checkout@v2
+    - uses: bazelbuild/setup-bazelisk@v1
+    - name: Mount bazel cache
+      uses: actions/cache@v2
+      with:
+        path: "~/.cache/bazel"
+        key: bazel
 
     - name: Build and test
       run: |
-        eval $(go env)
-        # install bazelisk as bazel to install the appropriate bazel version
-        wget https://github.com/bazelbuild/bazelisk/releases/download/v1.6.1/bazelisk-linux-${GOARCH} && chmod +x bazelisk-linux-${GOARCH} && mv bazelisk-linux-${GOARCH} $HOME/bin/bazel
-
-        CPU=k8
-        bazel clean --curses=no
-        bazel build --cpu=${CPU} --curses=no //package_manager:dpkg_parser.par
-        bazel build --cpu=${CPU} --curses=no //...
-        # Build all targets tagged with our architecture:
-        bazel build --cpu=${CPU} --curses=no $(bazel query 'attr("tags", "'${GOARCH}'", "//...")')
-        # Run all tests not tagged as "manual":
-        bazel test  --cpu=${CPU} --curses=no --test_output=errors --test_timeout=900 //...
-        # Run all tests tagged with our architecture:
-        bazel test  --cpu=${CPU} --curses=no --test_output=errors --test_timeout=900 $(bazel query 'attr("tags", "'${GOARCH}'", "//...")')
-
+        set -ex
+        bazel build --curses=no //package_manager:dpkg_parser.par
+        bazel build --curses=no //...
+        bazel test --curses=no --test_output=errors //...
+        # Ignore java8 and experimental targets, which might not pass.
+        # TODO: Fix or remove these exceptions.
+        targets=$(bazel query 'attr("tags", "'amd64'", "//...")' | grep -v java8 | grep -v experimental)
+        bazel build --curses=no ${targets}
+        bazel test --curses=no --test_output=errors ${targets}

.github/workflows/pylint.yaml

@@ -2,7 +2,7 @@ name: Pylint
 
 on:
   pull_request:
-    branches: [ 'master' ]
+    branches: [ 'main' ]
 
 jobs:
 
@@ -27,4 +27,4 @@ jobs:
       - name: Run pylint
         shell: bash
         run: |
-          find . -name "*.py" | xargs pylint --disable=R,C
+          find . -name "*.py" | xargs pylint --disable=R,C

README.md

@@ -1,6 +1,6 @@
 # "Distroless" Docker Images
 
-[![Build Status](https://travis-ci.org/GoogleContainerTools/distroless.svg?branch=master)](https://travis-ci.org/GoogleContainerTools/distroless)
+[![CI Build Status](https://github.com/GoogleContainerTools/distroless/actions/workflows/ci.yaml/badge.svg)](https://github.com/GoogleContainerTools/distroless/actions/workflows/ci.yaml)
 
 "Distroless" images contain only your application and its runtime dependencies.
 They do not contain package managers, shells or any other programs you would expect to find in a standard Linux distribution.
@@ -71,7 +71,6 @@ Follow these steps to get started:
     * [gcr.io/distroless/python2.7-debian10](experimental/python2.7/README.md)
     * [gcr.io/distroless/python3-debian10](experimental/python3/README.md)
     * [gcr.io/distroless/java/jetty-debian10](java/jetty/README.md)
-    * [gcr.io/distroless/dotnet](experimental/dotnet/README.md)
 * Write a multi-stage docker file.
   Note: This requires Docker 17.05 or higher.
 
@@ -105,7 +104,6 @@ You can find other examples here:
 * [Python 3](examples/python3/Dockerfile)
 * [Golang](examples/go/Dockerfile)
 * [Node.js](examples/nodejs/Dockerfile)
-* [dotnet](examples/dotnet/Dockerfile)
 * [Rust](examples/rust/Dockerfile)
 
 To run any example, go to the directory for the language and run
@@ -142,7 +140,6 @@ See here for:
 * [Python 3](examples/python3/BUILD)
 * [Golang](examples/go/BUILD)
 * [Node.js](examples/nodejs/BUILD)
-* [dotnet](examples/dotnet/BUILD)
 
 See here for examples on how to complete some common tasks in your image:
 

WORKSPACE

@@ -213,38 +213,6 @@ http_archive(
     urls = ["https://nodejs.org/dist/v14.17.2/node-v14.17.2-linux-arm64.tar.gz"],
 )
 
-http_archive(
-    name = "dotnet",
-    build_file = "//experimental/dotnet:BUILD.dotnet",
-    sha256 = "69ecad24bce4f2132e0db616b49e2c35487d13e3c379dabc3ec860662467b714",
-    type = "tar.gz",
-    urls = ["https://download.microsoft.com/download/5/F/0/5F0362BD-7D0A-4A9D-9BF9-022C6B15B04D/dotnet-runtime-2.0.0-linux-x64.tar.gz"],
-)
-
-http_archive(
-    name = "dotnet_core_aspnet",
-    build_file = "//experimental/dotnet:BUILD.dotnet",
-    sha256 = "823f8ea555fd56ab40d56d423748036204c4540c08baa61de4462978a0c35583",
-    type = "tar.gz",
-    urls = ["https://download.visualstudio.microsoft.com/download/pr/f7c8f82a-8c47-497d-875b-2ac210599ec5/e8aea0c195efed8a9aff2ba687db8c26/aspnetcore-runtime-3.1.8-linux-x64.tar.gz"],
-)
-
-http_archive(
-    name = "dotnet_core_runtime",
-    build_file = "//experimental/dotnet:BUILD.dotnet",
-    sha256 = "c50800e02cea23609ec6a009b1fbfe6b1f7ec4634c54bee089f918fca8fe2323",
-    type = "tar.gz",
-    urls = ["https://download.visualstudio.microsoft.com/download/pr/e4e47a0a-132e-416a-b8eb-f3373ad189d9/43af4412e27696c3c16e50f496f6c7af/dotnet-runtime-3.1.8-linux-x64.tar.gz"],
-)
-
-http_archive(
-    name = "dotnet_core_sdk",
-    build_file = "//experimental/dotnet:BUILD.dotnet",
-    sha256 = "2b6b172f9483e499141e37a6b932a547d9476bf03f3e71a0fefb76c52e01a9ee",
-    type = "tar.gz",
-    urls = ["https://download.visualstudio.microsoft.com/download/pr/f01e3d97-c1c3-4635-bc77-0c893be36820/6ec6acabc22468c6cc68b61625b14a7d/dotnet-sdk-3.1.402-linux-x64.tar.gz"],
-)
-
 # For the debug image
 http_file(
     name = "busybox_amd64",