Skip to content

Commit 0856ebe

Browse files
author
Mark R. Tuttle
committed
Clean up packages.yaml.
Delete unneeded portions of packages.yaml (don't just comment them out), and delete all unneeded environment variable definitions.
1 parent c876645 commit 0856ebe

File tree

1 file changed

+28
-146
lines changed

1 file changed

+28
-146
lines changed

‎.github/workflows/packages.yaml

Lines changed: 28 additions & 146 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,13 @@ jobs:
1515
#
1616
name: Generate package tag
1717
runs-on: ubuntu-latest
18-
env:
19-
PACKAGE_NAME: cbmc-latest
20-
VERSION_SCRIPT: .github/workflows/version.py
2118
outputs:
2219
time: ${{ steps.time.outputs.time }}
2320
sha: ${{ steps.sha.outputs.sha }}
2421
runid: ${{ steps.runid.outputs.runid }}
2522
runnum: ${{ steps.runnum.outputs.runnum }}
26-
name: ${{ env.PACKAGE_NAME }}
2723
cbmc_version: ${{ steps.version.outputs.cbmc_version }}
2824
pkg_version: ${{ steps.version.outputs.pkg_version }}
29-
opentag: ${{ steps.opentag.outputs.opentag }}
30-
closedtag: ${{ steps.closedtag.outputs.closedtag }}
3125
steps:
3226

3327
- name: Checkout the repository
@@ -74,16 +68,12 @@ jobs:
7468
runs-on: ubuntu-16.04
7569
needs: Tags
7670
env:
77-
OS: xenial
7871
PKG_VERSION: ${{needs.Tags.outputs.pkg_version}}
7972
CBMC_VERSION: ${{needs.Tags.outputs.cbmc_version}}
80-
TIME: ${{needs.Tags.outputs.time}}
81-
SHA: ${{needs.Tags.outputs.sha}}
82-
83-
PACKAGE_STABLE_NAME: cbmc_${{needs.Tags.outputs.pkg_version}}~xenial_amd64.deb
84-
ARTIFACT_STABLE_NAME: Ubuntu16 cbmc ${{needs.Tags.outputs.pkg_version}} xenial ${{needs.Tags.outputs.time}} ${{needs.Tags.outputs.sha}} ${{needs.Tags.outputs.runid}}
85-
73+
PACKAGE_NAME: cbmc_${{needs.Tags.outputs.pkg_version}}~xenial_amd64.deb
74+
ARTIFACT_NAME: Ubuntu16 cbmc ${{needs.Tags.outputs.pkg_version}} xenial ${{needs.Tags.outputs.time}} ${{needs.Tags.outputs.sha}} ${{needs.Tags.outputs.runid}}
8675
SCRIPT_DIR: .github/workflows/debian
76+
8777
steps:
8878

8979
- name: Checkout the repository
@@ -97,65 +87,25 @@ jobs:
9787
cp -r . /tmp/cbmc-${CBMC_VERSION}
9888
cp ${SCRIPT_DIR}/Makefile ${SCRIPT_DIR}/changelog ${SCRIPT_DIR}/surefire ${SCRIPT_DIR}/64bit_regression_tests.patch /tmp
9989
make -C /tmp GITHUB=1 STABLE=1 CBMC_VERSION=${CBMC_VERSION} PKG_VERSION=${PKG_VERSION}
100-
mv /tmp/*.deb ${PACKAGE_STABLE_NAME}
90+
mv /tmp/*.deb ${PACKAGE_NAME}
10191
10292
- name: Upload the package
10393
uses: actions/upload-artifact@v1
10494
with:
105-
name: ${{ env.ARTIFACT_STABLE_NAME }}
106-
path: ${{ env.PACKAGE_STABLE_NAME }}
107-
108-
# Ubuntu16_Latest:
109-
# name: Ubuntu 16 cbmc-latest package
110-
# runs-on: ubuntu-16.04
111-
# needs: Tags
112-
# env:
113-
# OS: xenial
114-
# PKG_VERSION: ${{needs.Tags.outputs.pkg_version}}
115-
# CBMC_VERSION: ${{needs.Tags.outputs.cbmc_version}}
116-
# TIME: ${{needs.Tags.outputs.time}}
117-
# SHA: ${{needs.Tags.outputs.sha}}
118-
#
119-
# PACKAGE_LATEST_NAME: cbmc-latest_${{needs.Tags.outputs.pkg_version}}~xenial_amd64.deb
120-
# ARTIFACT_LATEST_NAME: Ubuntu16 cbmc-latest ${{needs.Tags.outputs.pkg_version}} xenial ${{needs.Tags.outputs.time}} ${{needs.Tags.outputs.sha}} ${{needs.Tags.outputs.runid}}
121-
#
122-
# SCRIPT_DIR: .github/workflows/debian
123-
# steps:
124-
#
125-
# - name: Checkout the repository
126-
# uses: actions/checkout@v2
127-
#
128-
# - name: Update the submodules
129-
# run: git submodule update --init
130-
#
131-
# - name: Create the package
132-
# run: |
133-
# cp -r . /tmp/cbmc-${CBMC_VERSION}
134-
# cp ${SCRIPT_DIR}/Makefile ${SCRIPT_DIR}/changelog ${SCRIPT_DIR}/surefire ${SCRIPT_DIR}/64bit_regression_tests.patch /tmp
135-
# make -C /tmp GITHUB=1 STABLE= CBMC_VERSION=${CBMC_VERSION} PKG_VERSION=${PKG_VERSION}
136-
# mv /tmp/*.deb ${PACKAGE_LATEST_NAME}
137-
#
138-
# - name: Upload the package
139-
# uses: actions/upload-artifact@v1
140-
# with:
141-
# name: ${{ env.ARTIFACT_LATEST_NAME }}
142-
# path: ${{ env.PACKAGE_LATEST_NAME }}
95+
name: ${{ env.ARTIFACT_NAME }}
96+
path: ${{ env.PACKAGE_NAME }}
14397

14498
Ubuntu18:
14599
name: Ubuntu 18 cbmc package
146100
runs-on: ubuntu-18.04
147101
needs: Tags
148102
env:
149-
OS: bionic
150103
PKG_VERSION: ${{needs.Tags.outputs.pkg_version}}
151104
CBMC_VERSION: ${{needs.Tags.outputs.cbmc_version}}
152-
TIME: ${{needs.Tags.outputs.time}}
153-
SHA: ${{needs.Tags.outputs.sha}}
154-
155-
PACKAGE_STABLE_NAME: cbmc_${{needs.Tags.outputs.pkg_version}}~bionic_amd64.deb
156-
ARTIFACT_STABLE_NAME: Ubuntu18 cbmc ${{needs.Tags.outputs.pkg_version}} bionic ${{needs.Tags.outputs.time}} ${{needs.Tags.outputs.sha}} ${{needs.Tags.outputs.runid}}
157-
105+
PACKAGE_NAME: cbmc_${{needs.Tags.outputs.pkg_version}}~bionic_amd64.deb
106+
ARTIFACT_NAME: Ubuntu18 cbmc ${{needs.Tags.outputs.pkg_version}} bionic ${{needs.Tags.outputs.time}} ${{needs.Tags.outputs.sha}} ${{needs.Tags.outputs.runid}}
158107
SCRIPT_DIR: .github/workflows/debian
108+
159109
steps:
160110

161111
- name: Checkout the repository
@@ -169,67 +119,24 @@ jobs:
169119
cp -r . /tmp/cbmc-${CBMC_VERSION}
170120
cp ${SCRIPT_DIR}/Makefile ${SCRIPT_DIR}/changelog ${SCRIPT_DIR}/surefire ${SCRIPT_DIR}/64bit_regression_tests.patch /tmp
171121
make -C /tmp GITHUB=1 STABLE=1 CBMC_VERSION=${CBMC_VERSION} PKG_VERSION=${PKG_VERSION}
172-
mv /tmp/*.deb ${PACKAGE_STABLE_NAME}
122+
mv /tmp/*.deb ${PACKAGE_NAME}
173123
174124
- name: Upload the package
175125
uses: actions/upload-artifact@v1
176126
with:
177-
name: ${{ env.ARTIFACT_STABLE_NAME }}
178-
path: ${{ env.PACKAGE_STABLE_NAME }}
179-
180-
# Ubuntu18_Latest:
181-
# name: Ubuntu 18 cbmc-latest package
182-
# runs-on: ubuntu-18.04
183-
# needs: Tags
184-
# env:
185-
# OS: bionic
186-
# PKG_VERSION: ${{needs.Tags.outputs.pkg_version}}
187-
# CBMC_VERSION: ${{needs.Tags.outputs.cbmc_version}}
188-
# TIME: ${{needs.Tags.outputs.time}}
189-
# SHA: ${{needs.Tags.outputs.sha}}
190-
#
191-
# PACKAGE_LATEST_NAME: cbmc-latest_${{needs.Tags.outputs.pkg_version}}~bionic_amd64.deb
192-
# ARTIFACT_LATEST_NAME: Ubuntu18 cbmc-latest ${{needs.Tags.outputs.pkg_version}} bionic ${{needs.Tags.outputs.time}} ${{needs.Tags.outputs.sha}} ${{needs.Tags.outputs.runid}}
193-
#
194-
# SCRIPT_DIR: .github/workflows/debian
195-
# steps:
196-
#
197-
# - name: Checkout the repository
198-
# uses: actions/checkout@v2
199-
#
200-
# - name: Update the submodules
201-
# run: git submodule update --init
202-
#
203-
# - name: Create the package
204-
# run: |
205-
# cp -r . /tmp/cbmc-${CBMC_VERSION}
206-
# cp ${SCRIPT_DIR}/Makefile ${SCRIPT_DIR}/changelog ${SCRIPT_DIR}/surefire ${SCRIPT_DIR}/64bit_regression_tests.patch /tmp
207-
# make -C /tmp GITHUB=1 STABLE= CBMC_VERSION=${CBMC_VERSION} PKG_VERSION=${PKG_VERSION}
208-
# mv /tmp/*.deb ${PACKAGE_LATEST_NAME}
209-
#
210-
# - name: Upload the package
211-
# uses: actions/upload-artifact@v1
212-
# with:
213-
# name: ${{ env.ARTIFACT_LATEST_NAME }}
214-
# path: ${{ env.PACKAGE_LATEST_NAME }}
127+
name: ${{ env.ARTIFACT_NAME }}
128+
path: ${{ env.PACKAGE_NAME }}
215129

216130
MacOS:
217-
name: MacOS packages
131+
name: MacOS tarball
218132
runs-on: macos-10.15
219133
needs: Tags
220134
env:
221-
OS: catalina
222135
VERSION: ${{needs.Tags.outputs.pkg_version}}
223-
TIME: ${{needs.Tags.outputs.time}}
224-
SHA: ${{needs.Tags.outputs.sha}}
225-
226-
PACKAGE_STABLE_NAME: cbmc_${{needs.Tags.outputs.pkg_version}}~catalina.tar.gz
227-
PACKAGE_LATEST_NAME: cbmc-latest_${{needs.Tags.outputs.pkg_version}}~catalina.tar.gz
228-
229-
ARTIFACT_STABLE_NAME: MacOS cbmc ${{needs.Tags.outputs.pkg_version}} catalina ${{needs.Tags.outputs.time}} ${{needs.Tags.outputs.sha}} ${{needs.Tags.outputs.runid}}
230-
ARTIFACT_LATEST_NAME: MacOS cbmc-latest ${{needs.Tags.outputs.pkg_version}} catalina ${{needs.Tags.outputs.time}} ${{needs.Tags.outputs.sha}} ${{needs.Tags.outputs.runid}}
231-
136+
PACKAGE_NAME: cbmc_${{needs.Tags.outputs.pkg_version}}~catalina.tar.gz
137+
ARTIFACT_NAME: MacOS cbmc ${{needs.Tags.outputs.pkg_version}} catalina ${{needs.Tags.outputs.time}} ${{needs.Tags.outputs.sha}} ${{needs.Tags.outputs.runid}}
232138
SCRIPT_DIR: .github/workflows/macos15
139+
233140
steps:
234141

235142
- name: Checkout the repository
@@ -241,37 +148,22 @@ jobs:
241148
- name: Build the package
242149
run: |
243150
make -f ${SCRIPT_DIR}/Makefile
244-
mv cbmc.tar.gz ${PACKAGE_STABLE_NAME}
245-
# mv cbmc-latest.tar.gz ${PACKAGE_LATEST_NAME}
151+
mv cbmc.tar.gz ${PACKAGE_NAME}
246152
247-
- name: Upload the cbmc package
153+
- name: Upload the package
248154
uses: actions/upload-artifact@v1
249155
with:
250-
name: ${{env.ARTIFACT_STABLE_NAME}}
251-
path: ${{env.PACKAGE_STABLE_NAME}}
252-
253-
# - name: Upload the cbmc-latest package
254-
# uses: actions/upload-artifact@v1
255-
# with:
256-
# name: ${{env.ARTIFACT_LATEST_NAME}}
257-
# path: ${{env.PACKAGE_LATEST_NAME}}
156+
name: ${{env.ARTIFACT_NAME}}
157+
path: ${{env.PACKAGE_NAME}}
258158

259159
VS2019:
260-
name: Windows VS2019 installers
160+
name: Windows VS2019 installer
261161
runs-on: windows-2019
262162
needs: Tags
263163
env:
264-
OS: vs2019
265164
VERSION: ${{needs.Tags.outputs.pkg_version}}
266-
TIME: ${{needs.Tags.outputs.time}}
267-
SHA: ${{needs.Tags.outputs.sha}}
268-
269-
PACKAGE_STABLE_NAME: cbmc_${{needs.Tags.outputs.pkg_version}}~vs2019.msi
270-
PACKAGE_LATEST_NAME: cbmc-latest_${{needs.Tags.outputs.pkg_version}}~vs2019.msi
271-
272-
ARTIFACT_STABLE_NAME: Windows cbmc ${{needs.Tags.outputs.pkg_version}} vs2019 ${{needs.Tags.outputs.time}} ${{needs.Tags.outputs.sha}} ${{needs.Tags.outputs.runid}}
273-
ARTIFACT_LATEST_NAME: Windows cbmc-latest ${{needs.Tags.outputs.pkg_version}} vs2019 ${{needs.Tags.outputs.time}} ${{needs.Tags.outputs.sha}} ${{needs.Tags.outputs.runid}}
274-
165+
PACKAGE_NAME: cbmc_${{needs.Tags.outputs.pkg_version}}~vs2019.msi
166+
ARTIFACT_NAME: Windows cbmc ${{needs.Tags.outputs.pkg_version}} vs2019 ${{needs.Tags.outputs.time}} ${{needs.Tags.outputs.sha}} ${{needs.Tags.outputs.runid}}
275167
SCRIPT_DIR: .github\workflows\vs2019
276168

277169
defaults:
@@ -294,22 +186,12 @@ jobs:
294186
- name: Build cbmc
295187
run: ${{env.SCRIPT_DIR}}\build-cbmc.bat
296188

297-
- name: Build the stable installer
189+
- name: Build the installer
298190
run: |
299-
${{env.SCRIPT_DIR}}\build-installer.bat cbmc && move cbmc.msi ${{env.PACKAGE_STABLE_NAME}}
300-
301-
# - name: Build the latest installer
302-
# run: |
303-
# ${{env.SCRIPT_DIR}}\build-installer.bat cbmc-latest && move cbmc-latest.msi ${{env.PACKAGE_LATEST_NAME}}
191+
${{env.SCRIPT_DIR}}\build-installer.bat cbmc && move cbmc.msi ${{env.PACKAGE_NAME}}
304192
305-
- name: Upload the cbmc installer
193+
- name: Upload the installer
306194
uses: actions/upload-artifact@v1
307195
with:
308-
name: ${{env.ARTIFACT_STABLE_NAME}}
309-
path: ${{env.PACKAGE_STABLE_NAME}}
310-
311-
# - name: Upload the cbmc-latest installer
312-
# uses: actions/upload-artifact@v1
313-
# with:
314-
# name: ${{env.ARTIFACT_LATEST_NAME}}
315-
# path: ${{env.PACKAGE_LATEST_NAME}}
196+
name: ${{env.ARTIFACT_NAME}}
197+
path: ${{env.PACKAGE_NAME}}

0 commit comments

Comments
 (0)