Skip to content

Commit

Permalink
try cloning vets-website a different way to have more git informaiton
Browse files Browse the repository at this point in the history
  • Loading branch information
alexfinnarn committed Feb 21, 2024
1 parent 55e3c58 commit f723624
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 19 deletions.
14 changes: 1 addition & 13 deletions scripts/next-build-frontend.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,9 @@ echo "next-build version: ${next_build_version}" >> ${logfile}
echo "vets-website version: ${vets_website_version}" >> ${logfile}

# Tell the frontend (and the user) that we're starting.
#drush va-gov:content-release:advance-state starting
echo "==> Starting a frontend build. This file will be updated as the build progresses." >> ${logfile}

# Reset the repos to defaults.
#echo "==> Resetting VA repos to default versions" >> ${logfile}
#rm -rf ${reporoot}/docroot/vendor/va-gov
#composer install --no-scripts &>> ${logfile}

# Get the requested next-build version
# Get the requested next-build version.
if [ "${next_build_version}" != "__default" ]; then
echo "==> Checking out the requested frontend version" >> ${logfile}
pushd ${reporoot}/next
Expand Down Expand Up @@ -99,14 +93,8 @@ fi

# Run the build.
echo "==> Starting build" >> ${logfile}
#drush va-gov:content-release:advance-state inprogress
composer va:next:build &>> ${logfile}

# Advance the state in the frontend so another build can start.
echo "==> Build complete" >> ${logfile}
#drush va-gov:content-release:advance-state complete
#drush va-gov:content-release:advance-state ready

# After this point, we are less concerned with errors; the build has completed.
set +e

Expand Down
5 changes: 4 additions & 1 deletion scripts/vets-web-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ source ~/.bashrc
# Installs & builds vets-website dependencies for next-build preview.
#if [ ! -d docroot/vendor/va-gov/vets-website ]; then
if [ ! -d vets-website ]; then
git clone --single-branch --depth 1 https://github.com/department-of-veterans-affairs/vets-website.git vets-website
# Clone full so git information is available for content release form.
# I don't think this should be necessary, but branch information was not
# available in the content release form until I pulled down all information.
git clone https://github.com/department-of-veterans-affairs/vets-website.git vets-website
else
echo "Repo vets-website already cloned."
fi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@ public function testGetPathKey() {
$this->assertEquals(RepositorySettingsInterface::PATH_KEYS['content-build'], $repositorySettings->getPathKey('content-build'));
$this->assertEquals(RepositorySettingsInterface::PATH_KEYS['vets-website'], $repositorySettings->getPathKey('vets-website'));
$this->assertEquals(RepositorySettingsInterface::PATH_KEYS['next-build'], $repositorySettings->getPathKey('next-build'));
$this->assertEquals(RepositorySettingsInterface::PATH_KEYS['next-vets-website'], $repositorySettings->getPathKey('next-vets-website'));
// $this->assertEquals(
// RepositorySettingsInterface::PATH_KEYS['next-vets-website'],
// $repositorySettings->getPathKey('next-vets-website'));
}

/**
Expand All @@ -75,10 +77,10 @@ public function testList() {
'name' => RepositorySettingsInterface::NEXT_BUILD,
'path' => Settings::get('va_gov_next_build_root'),
],
[
'name' => RepositorySettingsInterface::NEXT_VETS_WEBSITE,
'path' => Settings::get('va_gov_next_vets_website_root'),
],
// [
// 'name' => RepositorySettingsInterface::NEXT_VETS_WEBSITE,
// 'path' => Settings::get('va_gov_next_vets_website_root'),
// ],
], $repositorySettings->list());
}

Expand Down

0 comments on commit f723624

Please sign in to comment.