Skip to content

Commit a1d36c2

Browse files
authored
Merge pull request ethereum#1385 from maticnetwork/djpolygon/packaging_cleanup
Removing control files and updating the updateVersion.sh
2 parents e1f6d25 + e2d3fbf commit a1d36c2

File tree

8 files changed

+18
-93
lines changed

8 files changed

+18
-93
lines changed

.github/workflows/amoy_deb_profiles.yml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,6 @@ jobs:
194194
ARCH: all
195195
NODE: sentry
196196
NETWORK: amoy
197-
198197
- name: Running package build for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }}
199198
run: dpkg-deb --build --root-owner-group packaging/deb/bor-pbss-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}
200199
env:
@@ -233,6 +232,12 @@ jobs:
233232
ARCH: all
234233
NODE: validator
235234
NETWORK: amoy
235+
- name: Copying systemd file for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }}
236+
run: cp -rp packaging/templates/systemd/bor.service packaging/deb/bor-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/lib/systemd/system/
237+
env:
238+
ARCH: all
239+
NODE: validator
240+
NETWORK: amoy
236241
- name: Building bor ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }} profile
237242
run: dpkg-deb --build --root-owner-group packaging/deb/bor-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}
238243
env:
@@ -271,6 +276,12 @@ jobs:
271276
ARCH: all
272277
NODE: validator
273278
NETWORK: amoy
279+
- name: Copying systemd file for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }}
280+
run: cp -rp packaging/templates/systemd/bor.service packaging/deb/bor-pbss-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/lib/systemd/system/
281+
env:
282+
ARCH: all
283+
NODE: validator
284+
NETWORK: amoy
274285
- name: Building bor ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }} profile
275286
run: dpkg-deb --build --root-owner-group packaging/deb/bor-pbss-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}
276287
env:
@@ -315,6 +326,12 @@ jobs:
315326
ARCH: all
316327
NODE: archive
317328
NETWORK: amoy
329+
- name: Copying systemd file for ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }}
330+
run: cp -rp packaging/templates/systemd/bor.service packaging/deb/bor-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}/lib/systemd/system/
331+
env:
332+
ARCH: all
333+
NODE: archive
334+
NETWORK: amoy
318335
- name: Building bor ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }} profile
319336
run: dpkg-deb --build --root-owner-group packaging/deb/bor-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}
320337
env:

packaging/templates/package_scripts/control

Lines changed: 0 additions & 12 deletions
This file was deleted.

packaging/templates/package_scripts/control.arm64

Lines changed: 0 additions & 13 deletions
This file was deleted.

packaging/templates/package_scripts/control.profile.amd64

Lines changed: 0 additions & 14 deletions
This file was deleted.

packaging/templates/package_scripts/control.profile.arm64

Lines changed: 0 additions & 12 deletions
This file was deleted.

packaging/templates/package_scripts/control.validator

Lines changed: 0 additions & 12 deletions
This file was deleted.

packaging/templates/package_scripts/control.validator.arm64

Lines changed: 0 additions & 13 deletions
This file was deleted.

scripts/updateVersion.sh

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -51,22 +51,6 @@ fi
5151
echo ""
5252
echo "New version is: $version"
5353

54-
# update version in all the 6 templates
55-
replace="Version: "$version
56-
fileArray=(
57-
"${DIR}/../packaging/templates/package_scripts/control"
58-
"${DIR}/../packaging/templates/package_scripts/control.arm64"
59-
"${DIR}/../packaging/templates/package_scripts/control.profile.amd64"
60-
"${DIR}/../packaging/templates/package_scripts/control.profile.arm64"
61-
"${DIR}/../packaging/templates/package_scripts/control.validator"
62-
"${DIR}/../packaging/templates/package_scripts/control.validator.arm64"
63-
)
64-
for file in ${fileArray[@]}; do
65-
# get the line starting with `Version` in the control file and store it in the $temp variable
66-
temp=$(grep "^Version.*" $file)
67-
sed -i '' "s%$temp%$replace%" $file
68-
done
69-
7054
# update version in ../params/version.go
7155
versionFile="${DIR}/../params/version.go"
7256
sed -i '' "s% = .*// Major% = $VersionMajor // Major%g" $versionFile

0 commit comments

Comments
 (0)