Merge branch 'contentctl_unit_changes' into dlux_1

.github/workflows/validate-and-build.yml → .github/workflows/build.yml

@@ -1,20 +1,18 @@
-name: validate-and-build
+name: build
 on:
-  push:
   pull_request:
-    types: [opened, reopened]
+    types: [opened, reopened, synchronize]
 jobs:
-
-  validate-and-build:
+  build:
     #Note that the CircleCI job used a Container.  The way to do this with Github Actions
     #is to first start up a Virtual Machine, then we can by following:
     # https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idcontainer
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: '3.11' #Available versions here - https://github.com/actions/python-versions/releases  easy to change/make a matrix/use pypy
           architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
@@ -23,29 +21,20 @@ jobs:
         run: |
           sudo apt update -qq
           sudo apt install jq -qq
-      
 
       - name: Install Python Dependencies and ContentCTL and Atomic Red Team
         run: |
-          python3.11 -m venv .venv
-          source .venv/bin/activate
           pip install contentctl
           git clone --depth=1 --single-branch --branch=master https://github.com/redcanaryco/atomic-red-team.git
       
-      - name: content_ctl validate
-        run: |
-          source .venv/bin/activate
-          contentctl validate 
-
-      - name: contentctl generate
+      - name: Running build with enrichments
         run: |
-          source .venv/bin/activate
           contentctl build --enrichments
           mkdir artifacts
           mv dist/DA-ESS-ContentUpdate-latest.tar.gz artifacts/
 
       - name: store_artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: content-latest
           path: |