Skip to content

Commit 5a7ecea

Browse files
committed
refactor: remove all Flatpak-related files and references
- Delete all Flatpak build scripts and configuration files - Remove Flatpak workflows from GitHub Actions - Clean up documentation to remove Flatpak references - Update README.md to focus on pip and native installation - Simplify build processes to Python-only packages
1 parent 40da934 commit 5a7ecea

19 files changed

Lines changed: 4 additions & 1798 deletions

‎.github/workflows/auto-release-on-push.yml‎

Lines changed: 0 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -231,79 +231,6 @@ jobs:
231231
env:
232232
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
233233

234-
build-flatpak:
235-
name: Build Flatpak
236-
needs: [check-for-release, create-release]
237-
runs-on: ubuntu-latest
238-
if: needs.check-for-release.outputs.should_release == 'true'
239-
240-
steps:
241-
- name: Checkout repository
242-
uses: actions/checkout@v4
243-
with:
244-
ref: v${{ needs.check-for-release.outputs.version }}
245-
246-
- name: Set up Flatpak builder
247-
run: |
248-
sudo apt-get update
249-
sudo apt-get install -y flatpak flatpak-builder
250-
flatpak --user remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
251-
252-
- name: Clear Flatpak cache
253-
run: |
254-
rm -rf ~/.cache/flatpak-builder || true
255-
256-
- name: Create build directory and files
257-
run: |
258-
mkdir -p build/flatpak
259-
cp bash_script_maker_flatpak.py build/flatpak/
260-
cp flatpak/org.securebits.bashscriptmaker.appdata.xml build/flatpak/
261-
262-
# Create the correct manifest
263-
cat > build/flatpak/org.securebits.bashscriptmaker.yml << 'EOF'
264-
app-id: org.securebits.bashscriptmaker
265-
runtime: org.freedesktop.Platform
266-
runtime-version: '23.08'
267-
sdk: org.freedesktop.Sdk
268-
command: bash-script-maker
269-
finish-args:
270-
- --share=ipc
271-
- --socket=wayland
272-
- --socket=x11
273-
- --socket=pulseaudio
274-
- --device=dri
275-
- --filesystem=home
276-
- --filesystem=host
277-
- --talk-name=org.freedesktop.Notifications
278-
modules:
279-
- name: bash-script-maker
280-
buildsystem: simple
281-
build-commands:
282-
- mkdir -p /app/bin
283-
- cp bash_script_maker_flatpak.py /app/bin/bash-script-maker
284-
- chmod +x /app/bin/bash-script-maker
285-
sources:
286-
- type: dir
287-
path: .
288-
EOF
289-
290-
- name: Build Flatpak
291-
run: |
292-
cd build/flatpak
293-
flatpak-builder --user --install-deps-from=flathub --force-clean --repo=repo build-dir org.securebits.bashscriptmaker.yml
294-
295-
- name: Create Flatpak Bundle
296-
run: |
297-
cd build/flatpak
298-
flatpak build-bundle repo BashScriptMaker-${{ needs.check-for-release.outputs.version }}.flatpak org.securebits.bashscriptmaker
299-
300-
- name: Upload Flatpak to release
301-
uses: softprops/action-gh-release@v1
302-
with:
303-
tag_name: v${{ needs.check-for-release.outputs.version }}
304-
files: build/flatpak/BashScriptMaker-${{ needs.check-for-release.outputs.version }}.flatpak
305-
env:
306-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
307234

308235
publish-pypi:
309236
name: Publish to PyPI

‎.github/workflows/auto-release.yml‎

Lines changed: 1 addition & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,6 @@ jobs:
6464
echo "# Via pip" >> release_notes.txt
6565
echo "pip install bash-script-maker==$VERSION" >> release_notes.txt
6666
echo "" >> release_notes.txt
67-
echo "# Via Flatpak" >> release_notes.txt
68-
echo "flatpak install BashScriptMaker-$VERSION.flatpak" >> release_notes.txt
6967
echo "\`\`\`" >> release_notes.txt
7068
fi
7169
else
@@ -133,82 +131,6 @@ jobs:
133131
env:
134132
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
135133

136-
build-flatpak:
137-
name: Build Flatpak Package
138-
needs: create-release
139-
runs-on: ubuntu-latest
140-
141-
steps:
142-
- name: Checkout repository
143-
uses: actions/checkout@v4
144-
145-
- name: Get version
146-
id: get_version
147-
run: |
148-
VERSION=${GITHUB_REF#refs/tags/v}
149-
echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
150-
151-
- name: Set up Flatpak builder
152-
run: |
153-
sudo apt-get update
154-
sudo apt-get install -y flatpak flatpak-builder
155-
flatpak --user remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
156-
157-
- name: Clear Flatpak cache
158-
run: |
159-
rm -rf ~/.cache/flatpak-builder || true
160-
161-
- name: Create build directory and files
162-
run: |
163-
mkdir -p build/flatpak
164-
cp bash_script_maker_flatpak.py build/flatpak/
165-
cp flatpak/org.securebits.bashscriptmaker.appdata.xml build/flatpak/
166-
167-
# Create the correct manifest
168-
cat > build/flatpak/org.securebits.bashscriptmaker.yml << 'EOF'
169-
app-id: org.securebits.bashscriptmaker
170-
runtime: org.freedesktop.Platform
171-
runtime-version: '23.08'
172-
sdk: org.freedesktop.Sdk
173-
command: bash-script-maker
174-
finish-args:
175-
- --share=ipc
176-
- --socket=wayland
177-
- --socket=x11
178-
- --socket=pulseaudio
179-
- --device=dri
180-
- --filesystem=home
181-
- --filesystem=host
182-
- --talk-name=org.freedesktop.Notifications
183-
modules:
184-
- name: bash-script-maker
185-
buildsystem: simple
186-
build-commands:
187-
- mkdir -p /app/bin
188-
- cp bash_script_maker_flatpak.py /app/bin/bash-script-maker
189-
- chmod +x /app/bin/bash-script-maker
190-
sources:
191-
- type: dir
192-
path: .
193-
EOF
194-
195-
- name: Build Flatpak
196-
run: |
197-
cd build/flatpak
198-
flatpak-builder --user --install-deps-from=flathub --force-clean --repo=repo build-dir org.securebits.bashscriptmaker.yml
199-
200-
- name: Create Flatpak Bundle
201-
run: |
202-
cd build/flatpak
203-
flatpak build-bundle repo BashScriptMaker-${{ steps.get_version.outputs.VERSION }}.flatpak org.securebits.bashscriptmaker
204-
205-
- name: Upload Flatpak Bundle
206-
uses: softprops/action-gh-release@v1
207-
with:
208-
tag_name: v${{ steps.get_version.outputs.VERSION }}
209-
files: build/flatpak/BashScriptMaker-${{ steps.get_version.outputs.VERSION }}.flatpak
210-
env:
211-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
212134

213135
publish-to-pypi:
214136
name: Publish to PyPI
@@ -241,7 +163,7 @@ jobs:
241163

242164
update-changelog:
243165
name: Update Changelog
244-
needs: [create-release, build-and-upload-assets, build-flatpak]
166+
needs: [create-release, build-and-upload-assets]
245167
runs-on: ubuntu-latest
246168
permissions:
247169
contents: write

‎.github/workflows/flatpak-build-simple.yml‎

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

0 commit comments

Comments
 (0)