Skip to content

Commit 74b8ba4

Browse files
craigcomstockcraigcomstock
committed
minimize work in workflows, revertme
1 parent c7c8345 commit 74b8ba4

File tree

2 files changed

+112
-112
lines changed

2 files changed

+112
-112
lines changed

‎.github/workflows/build-using-buildscripts.yml‎

Lines changed: 108 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -45,111 +45,111 @@ jobs:
4545
path: core
4646
ref: ${{steps.together.outputs.core || github.base_ref}}
4747
submodules: recursive
48-
49-
- name: Checkout Masterfiles
50-
uses: actions/checkout@v3
51-
with:
52-
repository: cfengine/masterfiles
53-
path: masterfiles
54-
ref: ${{steps.together.outputs.masterfiles || github.base_ref}}
55-
56-
- name: Checkout Buildscripts
57-
uses: actions/checkout@v3
58-
with:
59-
repository: cfengine/buildscripts
60-
path: buildscripts
61-
fetch-depth: 20
62-
63-
- name: Checkout Nova
64-
uses: actions/checkout@v3
65-
with:
66-
repository: cfengine/nova
67-
path: nova
68-
ref: ${{steps.together.outputs.nova || github.base_ref}}
69-
ssh-key: ${{ secrets.GH_ACTIONS_SSH_DEPLOY_KEY_NOVA_REPO }}
70-
ssh-known-hosts: github.com
71-
72-
- name: Checkout Enterprise
73-
uses: actions/checkout@v3
74-
with:
75-
repository: cfengine/enterprise
76-
path: enterprise
77-
ref: ${{steps.together.outputs.enterprise || github.base_ref}}
78-
submodules: recursive
79-
ssh-key: ${{ secrets.GH_ACTIONS_SSH_DEPLOY_KEY_ENTERPRISE_REPO }}
80-
ssh-known-hosts: github.com
81-
82-
- name: Checkout Mission Portal
83-
uses: actions/checkout@v3
84-
with:
85-
repository: cfengine/mission-portal
86-
path: mission-portal
87-
ref: ${{steps.together.outputs.mission-portal || github.base_ref}}
88-
submodules: recursive
89-
ssh-key: ${{ secrets.GH_ACTIONS_SSH_DEPLOY_KEY_MISSION_PORTAL_REPO }}
90-
ssh-known-hosts: github.com
91-
92-
- name: get PACKAGE_SHA for package cache
93-
run: echo "PACKAGE_SHA=$(buildscripts/ci/package-sha.sh)" | tee -a ${GITHUB_ENV}
94-
95-
- name: get SHA of buildscripts/deps-packaging last commit
96-
run: echo "DEPS_SHA=$(git log --pretty='format:%h' -1 -- .)" | tee -a ${GITHUB_ENV}
97-
working-directory: buildscripts/deps-packaging
98-
99-
- name: restore artifacts cache
100-
uses: actions/cache/restore@v3
101-
with:
102-
path: artifacts
103-
key: artifacts-${{ env.PACKAGE_SHA }}
104-
restore-keys: |
105-
artifacts-${{ env.PACKAGE_SHA }}
106-
107-
- name: Restore dependency cache
108-
uses: actions/cache/restore@v3
109-
with:
110-
path: cache
111-
key: deps-${{ github.base_ref }}-${{ env.DEPS_SHA }}
112-
restore-keys: |
113-
deps-${{ github.base_ref }}
114-
deps-master
115-
deps
116-
117-
- name: restore configured and built core and nova projects
118-
uses: actions/cache/restore@v3
119-
with:
120-
path: build
121-
key: build-${{ env.PACKAGE_SHA }}
122-
restore-keys: |
123-
build-${{ env.PACKAGE_SHA }}
124-
125-
126-
- name: Build package in docker
127-
env:
128-
GH_ACTIONS_SSH_KEY_BUILD_ARTIFACTS_CACHE: ${{ secrets.GH_ACTIONS_SSH_KEY_BUILD_ARTIFACTS_CACHE }}
129-
run: |
130-
if [ ! -f artifacts/cfe*deb ]; then
131-
buildscripts/ci/docker-build-package.sh ${{ inputs.additional_artifacts }}
132-
fi
133-
134-
- name: Save dependency cache
135-
uses: actions/cache/save@v3
136-
with:
137-
path: cache
138-
key: deps-${{ github.base_ref }}-${{ env.DEPS_SHA }}
139-
140-
- name: Save artifacts cache
141-
uses: actions/cache/save@v3
142-
with:
143-
path: |
144-
artifacts
145-
packages
146-
key: artifacts-${{ env.PACKAGE_SHA }}
147-
148-
- name: Save artifacts
149-
if: success() || failure()
150-
uses: actions/upload-artifact@v4
151-
with:
152-
name: artifacts
153-
path: |
154-
artifacts
155-
packages
48+
#
49+
# - name: Checkout Masterfiles
50+
# uses: actions/checkout@v3
51+
# with:
52+
# repository: cfengine/masterfiles
53+
# path: masterfiles
54+
# ref: ${{steps.together.outputs.masterfiles || github.base_ref}}
55+
#
56+
# - name: Checkout Buildscripts
57+
# uses: actions/checkout@v3
58+
# with:
59+
# repository: cfengine/buildscripts
60+
# path: buildscripts
61+
# fetch-depth: 20
62+
#
63+
# - name: Checkout Nova
64+
# uses: actions/checkout@v3
65+
# with:
66+
# repository: cfengine/nova
67+
# path: nova
68+
# ref: ${{steps.together.outputs.nova || github.base_ref}}
69+
# ssh-key: ${{ secrets.GH_ACTIONS_SSH_DEPLOY_KEY_NOVA_REPO }}
70+
# ssh-known-hosts: github.com
71+
#
72+
# - name: Checkout Enterprise
73+
# uses: actions/checkout@v3
74+
# with:
75+
# repository: cfengine/enterprise
76+
# path: enterprise
77+
# ref: ${{steps.together.outputs.enterprise || github.base_ref}}
78+
# submodules: recursive
79+
# ssh-key: ${{ secrets.GH_ACTIONS_SSH_DEPLOY_KEY_ENTERPRISE_REPO }}
80+
# ssh-known-hosts: github.com
81+
#
82+
# - name: Checkout Mission Portal
83+
# uses: actions/checkout@v3
84+
# with:
85+
# repository: cfengine/mission-portal
86+
# path: mission-portal
87+
# ref: ${{steps.together.outputs.mission-portal || github.base_ref}}
88+
# submodules: recursive
89+
# ssh-key: ${{ secrets.GH_ACTIONS_SSH_DEPLOY_KEY_MISSION_PORTAL_REPO }}
90+
# ssh-known-hosts: github.com
91+
#
92+
# - name: get PACKAGE_SHA for package cache
93+
# run: echo "PACKAGE_SHA=$(buildscripts/ci/package-sha.sh)" | tee -a ${GITHUB_ENV}
94+
#
95+
# - name: get SHA of buildscripts/deps-packaging last commit
96+
# run: echo "DEPS_SHA=$(git log --pretty='format:%h' -1 -- .)" | tee -a ${GITHUB_ENV}
97+
# working-directory: buildscripts/deps-packaging
98+
#
99+
# - name: restore artifacts cache
100+
# uses: actions/cache/restore@v3
101+
# with:
102+
# path: artifacts
103+
# key: artifacts-${{ env.PACKAGE_SHA }}
104+
# restore-keys: |
105+
# artifacts-${{ env.PACKAGE_SHA }}
106+
#
107+
# - name: Restore dependency cache
108+
# uses: actions/cache/restore@v3
109+
# with:
110+
# path: cache
111+
# key: deps-${{ github.base_ref }}-${{ env.DEPS_SHA }}
112+
# restore-keys: |
113+
# deps-${{ github.base_ref }}
114+
# deps-master
115+
# deps
116+
#
117+
# - name: restore configured and built core and nova projects
118+
# uses: actions/cache/restore@v3
119+
# with:
120+
# path: build
121+
# key: build-${{ env.PACKAGE_SHA }}
122+
# restore-keys: |
123+
# build-${{ env.PACKAGE_SHA }}
124+
#
125+
#
126+
# - name: Build package in docker
127+
# env:
128+
# GH_ACTIONS_SSH_KEY_BUILD_ARTIFACTS_CACHE: ${{ secrets.GH_ACTIONS_SSH_KEY_BUILD_ARTIFACTS_CACHE }}
129+
# run: |
130+
# if [ ! -f artifacts/cfe*deb ]; then
131+
# buildscripts/ci/docker-build-package.sh ${{ inputs.additional_artifacts }}
132+
# fi
133+
#
134+
# - name: Save dependency cache
135+
# uses: actions/cache/save@v3
136+
# with:
137+
# path: cache
138+
# key: deps-${{ github.base_ref }}-${{ env.DEPS_SHA }}
139+
#
140+
# - name: Save artifacts cache
141+
# uses: actions/cache/save@v3
142+
# with:
143+
# path: |
144+
# artifacts
145+
# packages
146+
# key: artifacts-${{ env.PACKAGE_SHA }}
147+
#
148+
# - name: Save artifacts
149+
# if: success() || failure()
150+
# uses: actions/upload-artifact@v4
151+
# with:
152+
# name: artifacts
153+
# path: |
154+
# artifacts
155+
# packages

‎.github/workflows/ci.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
uses: ./.github/workflows/build-using-buildscripts.yml
1010
secrets: inherit
1111

12-
deployment_tests:
13-
needs: build_cfengine_hub_package
14-
uses: ./.github/workflows/deployment-tests.yml
15-
secrets: inherit
12+
# deployment_tests:
13+
# needs: build_cfengine_hub_package
14+
# uses: ./.github/workflows/deployment-tests.yml
15+
# secrets: inherit

0 commit comments

Comments
 (0)