kopia lustrzana https://github.com/browsh-org/browsh
Merge branch 'master' into vim-mode-2022
commit
a0752462d4
|
@ -1,5 +1,5 @@
|
|||
name: Lint
|
||||
on: [push]
|
||||
on: [push, pull_request]
|
||||
|
||||
jobs:
|
||||
lint:
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
name: Test-Release
|
||||
on: [push]
|
||||
on: [push, pull_request]
|
||||
|
||||
jobs:
|
||||
tests:
|
||||
|
|
|
@ -17,7 +17,6 @@ RUN install_packages \
|
|||
bzip2
|
||||
|
||||
# Helper scripts
|
||||
RUN mkdir /build
|
||||
WORKDIR /build
|
||||
ADD .git .git
|
||||
ADD .github .github
|
||||
|
@ -34,10 +33,6 @@ WORKDIR $BASE
|
|||
RUN /build/ctl.sh install_golang $BASE
|
||||
RUN /build/ctl.sh build_browsh_binary $BASE
|
||||
|
||||
# Install firefox
|
||||
RUN /build/ctl.sh install_firefox
|
||||
|
||||
|
||||
###########################
|
||||
# Actual final Docker image
|
||||
###########################
|
||||
|
@ -47,7 +42,6 @@ ENV HOME=/app
|
|||
WORKDIR $HOME
|
||||
|
||||
COPY --from=build /go-home/src/browsh/interfacer/browsh /app/bin/browsh
|
||||
COPY --from=build /tmp/firefox /app/bin/firefox
|
||||
|
||||
RUN install_packages \
|
||||
xvfb \
|
||||
|
@ -57,7 +51,8 @@ RUN install_packages \
|
|||
libdbus-glib-1-2 \
|
||||
procps \
|
||||
libasound2 \
|
||||
libxtst6
|
||||
libxtst6 \
|
||||
firefox-esr
|
||||
|
||||
# Block ads, etc. This includes porn just because this image is also used on the
|
||||
# public SSH demo: `ssh brow.sh`.
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
package browsh
|
||||
|
||||
var browshVersion = "1.8.0"
|
||||
var browshVersion = "1.8.2"
|
||||
|
|
|
@ -83,11 +83,13 @@ function _rename_built_xpi() {
|
|||
function bundle_production_webextension() {
|
||||
local version && version=$(browsh_version)
|
||||
local base='https://github.com/browsh-org/browsh/releases/download'
|
||||
local release_url="$base/v$version/browsh-$version-an.fx.xpi"
|
||||
local release_url="$base/v$version/browsh-$version.xpi"
|
||||
echo "Downloading webextension from: $release_url"
|
||||
local size && size=$(wc -c <"$XPI_PATH")
|
||||
curl -L -o "$XPI_PATH" "$release_url"
|
||||
local size && size=$(wc -c <"$XPI_PATH")
|
||||
if [ "$size" -lt 500 ]; then
|
||||
echo "XPI size seems too small: $size"
|
||||
_panic "Problem downloading latest webextension XPI"
|
||||
fi
|
||||
cp -a "$XPI_PATH" "$(versioned_xpi_file)"
|
||||
}
|
||||
|
|
|
@ -51,10 +51,14 @@ function install_golang() {
|
|||
local version && version=$(parse_golang_version_from_go_mod "$path")
|
||||
[ "$GOPATH" = "" ] && _panic "GOPATH not set"
|
||||
[ "$GOROOT" = "" ] && _panic "GOROOT not set"
|
||||
echo "Installing Golang v$version... to $GOROOT"
|
||||
GOARCH=$(uname -m)
|
||||
[[ $GOARCH == aarch64 ]] && GOARCH=arm64
|
||||
[[ $GOARCH == x86_64 ]] && GOARCH=amd64
|
||||
url=https://dl.google.com/go/go"$version".linux-"$GOARCH".tar.gz
|
||||
echo "Installing Golang ($url)... to $GOROOT"
|
||||
curl -L \
|
||||
-o go.tar.gz \
|
||||
https://dl.google.com/go/go"$version".linux-amd64.tar.gz
|
||||
"$url"
|
||||
mkdir -p "$GOPATH"/bin
|
||||
mkdir -p "$GOROOT"
|
||||
tar -C "$GOROOT/.." -xzf go.tar.gz
|
||||
|
|
Plik diff jest za duży
Load Diff
|
@ -23,7 +23,7 @@
|
|||
"prettier": "2.7.1",
|
||||
"sinon": "^14.0.0",
|
||||
"strip-ansi": "^7.0.1",
|
||||
"web-ext": "^7.1.1",
|
||||
"web-ext": "^7.5.0",
|
||||
"webpack": "^5.73.0",
|
||||
"webpack-cli": "^4.10.0"
|
||||
},
|
||||
|
|
Ładowanie…
Reference in New Issue