diff --git a/.github/workflows/Unit-Test.yml b/.github/workflows/Unit-Test.yml index 3e129a334..97823022a 100644 --- a/.github/workflows/Unit-Test.yml +++ b/.github/workflows/Unit-Test.yml @@ -16,8 +16,9 @@ jobs: - name: Unit Tests run: | sudo docker run -t satmandu/crewbuild:amd64 sudo -i -u chronos /bin/bash -c " - echo \"CREW_REPO is ${{ github.actor }}\" && \ + echo \"CREW_REPO is ${{ github.event.pull_request.head.repo.clone_url }}\" && \ echo \"CREW_BRANCH is ${{ github.head_ref }}\" && \ - CREW_REPO=https://github.com/${{ github.actor }}/chromebrew.git CREW_BRANCH=${{ github.head_ref }} crew update && \ + CREW_REPO=${{ github.event.pull_request.head.repo.clone_url }} CREW_BRANCH=${{ github.head_ref }} crew update && \ yes | crew upgrade && \ - yes | crew install vim" + yes | crew install vim && \ + yes | crew remove vim" diff --git a/bin/crew b/bin/crew index 3f3ed581e..daf348e5e 100755 --- a/bin/crew +++ b/bin/crew @@ -660,8 +660,8 @@ def update system "git sparse-checkout set packages manifest/#{USER_SPACE_ARCH} lib bin crew tools" system 'git sparse-checkout reapply' - system "git fetch #{CREW_REPO} #{CREW_BRANCH}" - system 'git reset --hard FETCH_HEAD' + system "git fetch #{CREW_REPO} #{CREW_BRANCH}", exception: true + system 'git reset --hard FETCH_HEAD', exception: true end puts 'Package lists, crew, and library updated.' diff --git a/lib/const.rb b/lib/const.rb index 2cb6c1a12..1d9061c44 100644 --- a/lib/const.rb +++ b/lib/const.rb @@ -1,6 +1,6 @@ # lib/const.rb # Defines common constants used in different parts of crew -CREW_VERSION = '1.38.10' +CREW_VERSION = '1.38.11' # kernel architecture KERN_ARCH = `uname -m`.chomp