Skip to content

Commit

Permalink
Configure setup-python in GHA to install Python and deps.
Browse files Browse the repository at this point in the history
Also, remove dead code for unused SSH deployment post-refactors from
before.
  • Loading branch information
aj-stein-nist committed May 4, 2022
1 parent 6df7414 commit be66460
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 8 deletions.
18 changes: 11 additions & 7 deletions .github/workflows/content-artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,17 @@ jobs:
- name: Get Saxon-HE
run: |
mvn org.apache.maven.plugins:maven-dependency-plugin:2.10:get -DartifactId=Saxon-HE -DgroupId=net.sf.saxon -Dversion=$SAXON_VERSION
- name: Set up Python 3.x
uses: actions/setup-python@98f2ad02fd48d057ee3b4d4f66525b231c3e52b6 # current release v3.1.2
with:
python-version: '3.8'
architecture: 'x64'
cache: 'pip'
cache-dependency-path: |
git-content/${{ env.CICD_DIR_PATH }}/python/requirements.txt
- name: Install Python dependencies
run: |
pip install -r "${GITHUB_WORKSPACE}/git-content/${CICD_DIR_PATH}/python/requirements.txt"
- name: Validate Content
run:
# mkdir -p "${OSCAL_BUILD_DIR_PATH}"
Expand All @@ -66,13 +77,6 @@ jobs:
- name: Auto-convert Content
run:
bash "${GITHUB_WORKSPACE}/git-content/${CICD_DIR_PATH}/copy-and-convert-content.sh" -o "${GITHUB_WORKSPACE}/git-content/${OSCAL_DIR_PATH}" -a "${GITHUB_WORKSPACE}/git-content" -c "${GITHUB_WORKSPACE}/git-content/${CONTENT_CONFIG_PATH}" -w "${GITHUB_WORKSPACE}/git-content" --resolve-profiles
# job-deploy-artifacts
# - name: Setup SSH key
# # only do this on master in the home repo
# if: github.repository == env.HOME_REPO && github.ref == 'refs/heads/master'
# run: |
# eval "$(ssh-agent -s)"
# ssh-add - <<< "${{ secrets.SSH_PRIVATE_KEY }}"
- name: Publish Artifacts
# only do this on master
if: github.repository == env.HOME_REPO && github.ref == 'refs/heads/master'
Expand Down
2 changes: 1 addition & 1 deletion oscal
Submodule oscal updated 688 files

0 comments on commit be66460

Please sign in to comment.