Skip to content

Commit

Permalink
Merge branch 'master' of github.com:gwaldron/osgearth
Browse files Browse the repository at this point in the history
  • Loading branch information
gwaldron committed Dec 3, 2020
2 parents b7ead35 + 608c99a commit 342fcad
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 51 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/test/linux-vcpkg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,12 @@ jobs:
- name: Free disk space / Setup environment
# https://github.com/actions/virtual-environments/issues/709
run: |
df -h
echo "Removing large packages"
sudo rm -rf "/usr/local/share/boost"
sudo rm -rf "$AGENT_TOOLSDIRECTORY"
docker rmi $(docker image ls -aq)
sudo apt-get autoremove -y
sudo apt-get clean
df -h
sudo apt-get install libgl-dev
- uses: actions/checkout@v2
Expand Down Expand Up @@ -69,10 +67,10 @@ jobs:
run: >
${{ matrix.mono }} `./vcpkg/vcpkg fetch nuget | tail -n 1`
sources add
-source "https://nuget.pkg.github.com/remoe/index.json"
-source "https://nuget.pkg.github.com/${{ github.actor }}/index.json"
-storepasswordincleartext
-name "GitHub"
-username "remoe"
-username "${{ github.actor }}"
-password "${{ secrets.GITHUB_TOKEN }}"
# Omit this step if you're using manifests
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: windows-x64-Release

on: [workflow_dispatch]
on: [push, pull_request, workflow_dispatch]

env:
VCPKG_BINARY_SOURCES : 'clear;nuget,GitHub,readwrite'
Expand Down
46 changes: 0 additions & 46 deletions .travis.yml

This file was deleted.

0 comments on commit 342fcad

Please sign in to comment.