Github actions defaults is stupid

sdg0919 · Oct 9, 2020 · e53f740 · e53f740
1 parent 0ead9bb
commit e53f740
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/.github/workflows/client-tests.yml b/.github/workflows/client-tests.yml
@@ -14,8 +14,8 @@ jobs:
         # on macOS, but we should investigate that to improve our coverage on
         # other clients.
         # To turn on macOS, just update the os to include it.
-        # os: [ubuntu-latest, macOS-latest]
-        os: [ubuntu-latest, windows-latest]
+        # os: [ubuntu-latest, macOS-latest, windows-latest]
+        os: [ubuntu-latest]
 
     steps:
 
@@ -52,11 +52,17 @@ jobs:
         sudo ln -s /usr/local/mongodb/mongod /usr/local/bin/mongod
       shell: bash
 
+    - name: "Remove Mongo Dependencies: windows-latest"
+      if: (matrix.os == 'windows-latest')
+      uses: crazy-max/ghaction-chocolatey@v1
+      with:
+        args: uninstall mongodb mongodb.install -y --all-versions
+
     - name: "Install Mongo Dependencies: windows-latest"
       if: (matrix.os == 'windows-latest')
       uses: crazy-max/ghaction-chocolatey@v1
       with:
-        args: install mongodb --version=3.6.0 --allow-downgrade
+        args: install mongodb.install --version=3.6.0 --allow-downgrade
 
     - name: Test client
       run: |

diff --git a/cmd/juju/application/deployer/deployer.go b/cmd/juju/application/deployer/deployer.go
@@ -541,7 +541,6 @@ func (d *factory) validateCharmSeriesWithName(series, name string, imageStream s
 func charmValidationError(charmSeries, name string, err error) error {
 	if err != nil {
 		if errors.IsNotSupported(err) {
-			panic(err)
 			return errors.Errorf("%v is not available on the following %v", name, err)
 		}
 		return errors.Trace(err)

diff --git a/go.mod b/go.mod
@@ -60,7 +60,7 @@ require (
 	github.com/juju/mutex v0.0.0-20180619145857-d21b13acf4bf
 	github.com/juju/names/v4 v4.0.0-20200929085019-be23e191fee0
 	github.com/juju/naturalsort v0.0.0-20180423034842-5b81707e882b
-	github.com/juju/os v0.0.0-20201009080513-2df8a6f90d6a
+	github.com/juju/os v0.0.0-20201009104722-9ea36b308caa
 	github.com/juju/packaging v0.0.0-20200421095529-970596d2622a
 	github.com/juju/persistent-cookiejar v0.0.0-20170428161559-d67418f14c93
 	github.com/juju/proxy v0.0.0-20180523025733-5f8741c297b4

diff --git a/go.sum b/go.sum
@@ -487,8 +487,8 @@ github.com/juju/os v0.0.0-20190625135142-88a4c6ac59c1/go.mod h1:buR1fIbfLx3neIA/
 github.com/juju/os v0.0.0-20191022170002-da411304426c/go.mod h1:buR1fIbfLx3neIA/TKE8ZlS/nRR3keo+hjVqV+VR4ns=
 github.com/juju/os v0.0.0-20200701063157-8e6dd7a2b438 h1:OJQkulSmv3WklByylSxQxsyQXD3ufLXa8pzcnj7JhLk=
 github.com/juju/os v0.0.0-20200701063157-8e6dd7a2b438/go.mod h1:aswA7dG+jFZC4cTmuTphPpWS9jm7NXP5dG6jEPvfQBY=
-github.com/juju/os v0.0.0-20201009080513-2df8a6f90d6a h1:O7Nom5Ecicise1C4pWdEMQwZ28K+aCI9eKH/psAPwbQ=
-github.com/juju/os v0.0.0-20201009080513-2df8a6f90d6a/go.mod h1:aswA7dG+jFZC4cTmuTphPpWS9jm7NXP5dG6jEPvfQBY=
+github.com/juju/os v0.0.0-20201009104722-9ea36b308caa h1:2EaAdGJlb83txyv3wwJnSbsUyEEDkgO/4xlcRrTRa7A=
+github.com/juju/os v0.0.0-20201009104722-9ea36b308caa/go.mod h1:aswA7dG+jFZC4cTmuTphPpWS9jm7NXP5dG6jEPvfQBY=
 github.com/juju/packaging v0.0.0-20200421095529-970596d2622a h1:dMBYD9gIFbskcksH9ib+OvmOwwkJTS5ldwvZq3axlbY=
 github.com/juju/packaging v0.0.0-20200421095529-970596d2622a/go.mod h1:Brg98KsCnaxL6UxQ4pbVFlT4MoQO7x0kSzwnuvRbUy8=
 github.com/juju/persistent-cookiejar v0.0.0-20170428161559-d67418f14c93 h1:nlmpG1/Pv5elsi69wXhLkBhefGPE19bOCJ/xVwovl7A=