Skip to content
This repository was archived by the owner on Sep 30, 2024. It is now read-only.

Commit 1e838b7

Browse files
author
Fushra Bot
committed
πŸ”€ Backport changes from beta to alpha
2 parents 7195ab9 + 55b6854 commit 1e838b7

File tree

17 files changed

+61
-240
lines changed

17 files changed

+61
-240
lines changed

β€Ž.github/workflows/alpha.ymlβ€Ž

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,6 @@ jobs:
6060
wget https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-14/libclang_rt.builtins-wasm32-wasi-14.0.tar.gz
6161
sudo tar -xf libclang_rt.builtins-wasm32-wasi-14.0.tar.gz --strip-components=1 -C /usr/lib/llvm-10/lib/clang/10.0.0/lib/
6262
63-
# - name: Use an old rust version as a workaround
64-
# run: |
65-
# rustup install 1.45.2
66-
# rustup default 1.45.2
67-
# rustup override set 1.45.2
68-
6963
- name: Disable wasm sandboxing for the sake of my sanity
7064
run: |
7165
echo "ac_add_options --without-wasm-sandboxed-libraries" > mozconfig
@@ -126,14 +120,14 @@ jobs:
126120

127121
- name: Rename artifacts
128122
run: |
129-
cp ./engine/obj-*/dist/focus-browser-*.tar.bz2 .
130-
mv focus-browser-*.tar.bz2 "focus-browser.linux.tar.bz2"
123+
cp ./engine/obj-*/dist/pulse-browser-*.tar.bz2 .
124+
mv pulse-browser-*.tar.bz2 "pulse-browser.linux.tar.bz2"
131125
132126
- name: Upload artifact
133127
uses: actions/upload-artifact@v2
134128
with:
135-
name: focus-browser.linux.tar.bz2
136-
path: ./focus-browser.linux.tar.bz2
129+
name: pulse-browser.linux.tar.bz2
130+
path: ./pulse-browser.linux.tar.bz2
137131

138132
flatpak:
139133
name: πŸ“¦ Flatpak
@@ -145,15 +139,15 @@ jobs:
145139

146140
steps:
147141
- name: Clone packaging scripts
148-
run: git clone --recurse-submodules https://github.com/focus-browser/packages.git
142+
run: git clone --recurse-submodules https://github.com/pulse-browser/packages.git
149143

150144
- uses: actions/setup-node@v2
151145
with:
152146
node-version: '14'
153147

154148
- uses: actions/download-artifact@v2
155149
with:
156-
name: focus-browser.linux.tar.bz2
150+
name: pulse-browser.linux.tar.bz2
157151

158152
- name: Setup git
159153
run: |
@@ -175,18 +169,18 @@ jobs:
175169
- name: Download binaries
176170
run: |
177171
cd packages/flatpak
178-
cp ../../focus-browser.linux.tar.bz2 ./focus-browser.tar.bz2
179-
tar -xvf focus-browser.tar.bz2
172+
cp ../../pulse-browser.linux.tar.bz2 ./pulse-browser.tar.bz2
173+
tar -xvf pulse-browser.tar.bz2
180174
- uses: bilelmoussaoui/flatpak-github-actions@v2
181175
with:
182-
bundle: focus-browser.linux.flatpak
176+
bundle: pulse-browser.linux.flatpak
183177
manifest-path: './packages/flatpak/com.fushra.browser.desktop.yml'
184178

185179
- name: Upload artifact
186180
uses: actions/upload-artifact@v2
187181
with:
188-
name: focus-browser.linux.flatpak
189-
path: ./focus-browser.linux.flatpak
182+
name: pulse-browser.linux.flatpak
183+
path: ./pulse-browser.linux.flatpak
190184

191185
- name: Import GPG key
192186
run: |
@@ -200,14 +194,14 @@ jobs:
200194
cd packages/flatpak
201195
chmod +x ./build.sh
202196
./build.sh
203-
197+
204198
- name: Push to flatpak repo
205199
uses: ad-m/github-push-action@master
206200
with:
207201
github_token: ${{ secrets.TRICKYPR_TOKEN }}
208202
directory: './packages/flatpak/repo/'
209-
repository: 'focus-browser/repo'
210-
203+
repository: 'pulse-browser/repo'
204+
211205
release:
212206
name: Release
213207
needs: [build-data, linux, flatpak]
@@ -223,6 +217,5 @@ jobs:
223217
prerelease: true
224218
title: 'Alpha build'
225219
files: |
226-
focus-browser.linux.flatpak
227-
focus-browser.linux.tar.bz2
228-
220+
pulse-browser.linux.flatpak
221+
pulse-browser.linux.tar.bz2

β€ŽCHANGELOG.mdβ€Ž

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Changelog
2+
3+
All notable changes to this project will be documented in this file.
4+
5+
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
6+
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
7+
8+
## 1.0.0-b.1
9+
10+
### Added
11+
12+
- Changelog!
13+
- i10n for the welcome page ([#5](https://github.com/lepton-browser/browser/pull/5))
14+
15+
### Fixed
16+
17+
- Border radius in settings is now consistent with the rest of the UI ([#6](https://github.com/lepton-browser/browser/pull/6))
18+
- Vertical centering of images on welcome pages cards ([#18](https://github.com/lepton-browser/browser/pull/18))

β€Žconfigs/common/mozconfigβ€Ž

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ ac_add_options --enable-update-channel=stable
33
ac_add_options --with-ccache=sccache
44

55
ac_add_options --with-branding=browser/branding/stable
6-
ac_add_options --with-app-name=lepton-browser
7-
export MOZ_USER_DIR="Lepton browser"
8-
export MOZ_APP_VENDOR="Lepton browser"
9-
export MOZ_APP_BASENAME=LeptonBrowser
10-
export MOZ_APP_PROFILE=lepton-browser
11-
export MOZ_APP_DISPLAYNAME="Lepton browser"
6+
ac_add_options --with-app-name=pulse-browser
7+
export MOZ_USER_DIR="Pulse browser"
8+
export MOZ_APP_VENDOR="Pulse browser"
9+
export MOZ_APP_BASENAME=PulseBrowser
10+
export MOZ_APP_PROFILE=pulse-browser
11+
export MOZ_APP_DISPLAYNAME="Pulse browser"
1212
# Temporaroly removed
1313
# export MOZ_BRANDING_DIRECTORY=branding/unofficial
1414
# export MOZ_OFFICIAL_BRANDING_DIRECTORY=branding/unofficial
@@ -18,5 +18,5 @@ export MOZ_DISTRIBUTION_ID=com.fushra.browser.desktop
1818
# Misc
1919
export MOZ_STUB_INSTALLER=1
2020
export MOZ_INCLUDE_SOURCE_INFO=1
21-
export MOZ_SOURCE_REPO=https://github.com/lepton-browser/browser
21+
export MOZ_SOURCE_REPO=https://github.com/pulse-browser/browser
2222
export MOZ_SOURCE_CHANGESET=${changeset}

β€Žconfigs/linux/build_linux.shβ€Ž

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

β€Žconfigs/linux/linux.dockerfileβ€Ž

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

β€Žconfigs/linux/mozconfig-i686β€Ž

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

β€Žconfigs/macos/build_macos.shβ€Ž

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

β€Žconfigs/macos/macos.dockerfileβ€Ž

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

β€Žconfigs/macos/mozconfig-i686β€Ž

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

β€Žconfigs/windows/mozconfig-i686β€Ž

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

0 commit comments

Comments
Β (0)