Skip to content

Commit 0a2970b

Browse files
authored
Disable APT repository signing/upload (#225)
1 parent 3d83b88 commit 0a2970b

File tree

3 files changed

+6
-56
lines changed

3 files changed

+6
-56
lines changed

.github/workflows/release.yml

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -178,20 +178,6 @@ jobs:
178178
asset_name: defguard-proxy-${{ env.VERSION }}-${{ matrix.target }}.deb
179179
asset_content_type: application/octet-stream
180180

181-
- name: Install ruby with deb-s3
182-
if: matrix.build == 'linux'
183-
run: |
184-
sudo apt-get install -y ruby
185-
gem install deb-s3
186-
echo "$(ruby -r rubygems -e 'puts Gem.user_dir')/bin" >> $GITHUB_PATH
187-
188-
- name: Upload DEB to apt repository
189-
if: matrix.build == 'linux'
190-
run: |
191-
COMPONENT=$([[ "${{ github.ref_name }}" == *"-"* ]] && echo "pre-release" || echo "release") # if tag contain "-" assume it's pre-release.
192-
193-
deb-s3 upload -l --bucket=apt.defguard.net --access-key-id=${{ secrets.AWS_ACCESS_KEY_APT }} --secret-access-key=${{ secrets.AWS_SECRET_KEY_APT }} --s3-region=eu-north-1 --no-fail-if-exists --codename=trixie --component="$COMPONENT" defguard-proxy-${{ env.VERSION }}-${{ matrix.target }}.deb
194-
195181
- name: Build RPM package
196182
if: matrix.build == 'linux'
197183
uses: bpicode/github-action-fpm@master
@@ -209,39 +195,3 @@ jobs:
209195
asset_path: defguard-proxy-${{ env.VERSION }}-${{ matrix.target }}.rpm
210196
asset_name: defguard-proxy-${{ env.VERSION }}-${{ matrix.target }}.rpm
211197
asset_content_type: application/octet-stream
212-
213-
apt-sign:
214-
needs:
215-
- build-binaries
216-
runs-on:
217-
- self-hosted
218-
- Linux
219-
- X64
220-
strategy:
221-
fail-fast: false
222-
steps:
223-
- name: Sign APT repository on trixie
224-
run: |
225-
export AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_APT }}
226-
export AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_KEY_APT }}
227-
export AWS_REGION=eu-north-1
228-
sudo apt update -y
229-
sudo apt install -y awscli curl jq
230-
231-
for DIST in trixie; do
232-
aws s3 cp s3://apt.defguard.net/dists/${DIST}/Release .
233-
234-
curl -X POST "${{ secrets.DEFGUARD_SIGNING_URL }}?signature_type=both" \
235-
-H "Authorization: Bearer ${{ secrets.DEFGUARD_SIGNING_API_KEY }}" \
236-
-F "file=@Release" \
237-
-o response.json
238-
239-
cat response.json | jq -r '.files["Release.gpg"].content' | base64 --decode > Release.gpg
240-
cat response.json | jq -r '.files.Release.content' | base64 --decode > InRelease
241-
242-
aws s3 cp Release.gpg s3://apt.defguard.net/dists/${DIST}/ --acl public-read
243-
aws s3 cp InRelease s3://apt.defguard.net/dists/${DIST}/ --acl public-read
244-
245-
done
246-
(aws s3 ls s3://apt.defguard.net/dists/ --recursive; aws s3 ls s3://apt.defguard.net/pool/ --recursive) | awk '{print "<a href=\""$4"\">"$4"</a><br>"}' > index.html
247-
aws s3 cp index.html s3://apt.defguard.net/ --acl public-read

web/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"lodash-es": "^4.17.21",
3131
"motion": "^12.23.25",
3232
"qrcode.react": "^4.2.0",
33-
"qs": "^6.14.0",
33+
"qs": "^6.14.1",
3434
"react": "^19.2.1",
3535
"react-dom": "^19.2.1",
3636
"react-markdown": "^10.1.0",

web/pnpm-lock.yaml

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)