chore: Propagate all GitHub access tokens to all tests

chris468 · Feb 20, 2022 · c809a89 · c809a89
1 parent 8714b95
commit c809a89
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 2 deletions.
diff --git a/assets/docker/test.sh b/assets/docker/test.sh
@@ -10,5 +10,12 @@ for distribution in "$@"; do
         exit 1
     fi
     image="$(docker build . -f "assets/docker/${distribution}.Dockerfile" -q)"
-    docker run --env "CHEZMOI_GITHUB_TOKEN=${CHEZMOI_GITHUB_TOKEN-}" --rm --volume "${PWD}:/chezmoi" "${image}"
+    docker run \
+        --env "CHEZMOI_GITHUB_ACCESS_TOKEN=${CHEZMOI_GITHUB_ACCESS_TOKEN-}" \
+        --env "CHEZMOI_GITHUB_TOKEN=${CHEZMOI_GITHUB_TOKEN-}" \
+        --env "GITHUB_ACCESS_TOKEN=${GITHUB_ACCESS_TOKEN-}" \
+        --env "GITHUB_TOKEN=${GITHUB_TOKEN-}" \
+        --rm \
+        --volume "${PWD}:/chezmoi" \
+        "${image}"
 done
diff --git a/assets/vagrant/debian11-i386.Vagrantfile b/assets/vagrant/debian11-i386.Vagrantfile
@@ -7,5 +7,12 @@ Vagrant.configure("2") do |config|
     DEBIAN_FRONTEND=noninteractive apt-get update
     DEBIAN_FRONTEND=noninteractive apt-get install -y age gpg golang unzip xz-utils zip
   SHELL
+  config.vm.provision "shell", inline: <<-SHELL
+    echo CHEZMOI_GITHUB_ACCESS_TOKEN=#{ENV['CHEZMOI_GITHUB_ACCESS_TOKEN']} >> /home/vagrant/.bash_profile
+    echo CHEZMOI_GITHUB_TOKEN=#{ENV['CHEZMOI_GITHUB_TOKEN']} >> /home/vagrant/.bash_profile
+    echo GITHUB_ACCESS_TOKEN=#{ENV['GITHUB_ACCESS_TOKEN']} >> /home/vagrant/.bash_profile
+    echo GITHUB_TOKEN=#{ENV['GITHUB_TOKEN']} >> /home/vagrant/.bash_profile
+    echo export CHEZMOI_GITHUB_ACCESS_TOKEN CHEZMOI_GITHUB_TOKEN GITHUB_ACCESS_TOKEN GITHUB_TOKEN >> /home/vagrant/.bash_profile
+  SHELL
   config.vm.provision "file", source: "assets/vagrant/debian11-i386.test-chezmoi.sh", destination: "test-chezmoi.sh"
 end
diff --git a/assets/vagrant/freebsd13.Vagrantfile b/assets/vagrant/freebsd13.Vagrantfile
@@ -6,5 +6,12 @@ Vagrant.configure("2") do |config|
   config.vm.provision "shell", inline: <<-SHELL
     pkg install --quiet --yes age git gnupg go zip
   SHELL
+  config.vm.provision "shell", inline: <<-SHELL
+    echo CHEZMOI_GITHUB_ACCESS_TOKEN=#{ENV['CHEZMOI_GITHUB_ACCESS_TOKEN']} >> /home/vagrant/.bash_profile
+    echo CHEZMOI_GITHUB_TOKEN=#{ENV['CHEZMOI_GITHUB_TOKEN']} >> /home/vagrant/.bash_profile
+    echo GITHUB_ACCESS_TOKEN=#{ENV['GITHUB_ACCESS_TOKEN']} >> /home/vagrant/.bash_profile
+    echo GITHUB_TOKEN=#{ENV['GITHUB_TOKEN']} >> /home/vagrant/.bash_profile
+    echo export CHEZMOI_GITHUB_ACCESS_TOKEN CHEZMOI_GITHUB_TOKEN GITHUB_ACCESS_TOKEN GITHUB_TOKEN >> /home/vagrant/.bash_profile
+  SHELL
   config.vm.provision "file", source: "assets/vagrant/freebsd13.test-chezmoi.sh", destination: "test-chezmoi.sh"
 end
diff --git a/assets/vagrant/openbsd6.Vagrantfile b/assets/vagrant/openbsd6.Vagrantfile
@@ -1,3 +1,4 @@
+
 Vagrant.configure("2") do |config|
   config.vm.box = "generic/openbsd6"
   config.vm.define :openbsd6
@@ -6,5 +7,12 @@ Vagrant.configure("2") do |config|
   config.vm.provision "shell", inline: <<-SHELL
     pkg_add -x bzip2 git gnupg go zip
   SHELL
+  config.vm.provision "shell", inline: <<-SHELL
+    echo CHEZMOI_GITHUB_ACCESS_TOKEN=#{ENV['CHEZMOI_GITHUB_ACCESS_TOKEN']} >> /home/vagrant/.bash_profile
+    echo CHEZMOI_GITHUB_TOKEN=#{ENV['CHEZMOI_GITHUB_TOKEN']} >> /home/vagrant/.bash_profile
+    echo GITHUB_ACCESS_TOKEN=#{ENV['GITHUB_ACCESS_TOKEN']} >> /home/vagrant/.bash_profile
+    echo GITHUB_TOKEN=#{ENV['GITHUB_TOKEN']} >> /home/vagrant/.bash_profile
+    echo export CHEZMOI_GITHUB_ACCESS_TOKEN CHEZMOI_GITHUB_TOKEN GITHUB_ACCESS_TOKEN GITHUB_TOKEN >> /home/vagrant/.bash_profile
+  SHELL
   config.vm.provision "file", source: "assets/vagrant/openbsd6.test-chezmoi.sh", destination: "test-chezmoi.sh"
 end
diff --git a/assets/vagrant/openindiana.Vagrantfile b/assets/vagrant/openindiana.Vagrantfile
@@ -5,5 +5,11 @@ Vagrant.configure("2") do |config|
   config.vm.provision "shell", inline: <<-SHELL
     pkg install -q compress/zip developer/gcc-7 developer/golang developer/versioning/git
   SHELL
+  config.vm.provision "shell", inline: <<-SHELL
+    echo export CHEZMOI_GITHUB_ACCESS_TOKEN=#{ENV['CHEZMOI_GITHUB_ACCESS_TOKEN']} >> /export/home/vagrant/.profile
+    echo export CHEZMOI_GITHUB_TOKEN=#{ENV['CHEZMOI_GITHUB_TOKEN']} >> /export/home/vagrant/.profile
+    echo export GITHUB_ACCESS_TOKEN=#{ENV['GITHUB_ACCESS_TOKEN']} >> /export/home/vagrant/.profile
+    echo export GITHUB_TOKEN=#{ENV['GITHUB_TOKEN']} >> /export/home/vagrant/.profile
+  SHELL
   config.vm.provision "file", source: "assets/vagrant/openindiana.test-chezmoi.sh", destination: "test-chezmoi.sh"
 end
diff --git a/pkg/cmd/testdata/scripts/doctor_unix.txt b/pkg/cmd/testdata/scripts/doctor_unix.txt
@@ -21,7 +21,7 @@ mksourcedir
 # test that chezmoi doctor behaves as expected
 chezmoi doctor
 stdout '^ok\s+version\s+'
-stdout '^\w+\s+latest-version\s+'
+stdout '^warning\s+latest-version\s+'
 stdout '^ok\s+os-arch\s+'
 ! stdout '^\S+\s+systeminfo\s+'
 stdout '^ok\s+uname\s+'