Skip to content

Commit

Permalink
Merge branch 'master' into ruby3-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
AdityaHirapara authored Aug 22, 2023
2 parents bf452c6 + 9199bbc commit b44f38b
Show file tree
Hide file tree
Showing 5 changed files with 59 additions and 10 deletions.
48 changes: 48 additions & 0 deletions .github/workflows/Semgrep.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
# Name of this GitHub Actions workflow.
name: Semgrep

on:
# Scan changed files in PRs (diff-aware scanning):
# The branches below must be a subset of the branches above
pull_request:
branches: ["master", "main"]
push:
branches: ["master", "main"]
schedule:
- cron: '0 6 * * *'


permissions:
contents: read

jobs:
semgrep:
# User definable name of this GitHub Actions job.
permissions:
contents: read # for actions/checkout to fetch code
security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
name: semgrep/ci
# If you are self-hosting, change the following `runs-on` value:
runs-on: ubuntu-latest

container:
# A Docker image with Semgrep installed. Do not change this.
image: returntocorp/semgrep

# Skip any PR created by dependabot to avoid permission issues:
if: (github.actor != 'dependabot[bot]')

steps:
# Fetch project source with GitHub Actions Checkout.
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
# Run the "semgrep ci" command on the command line of the docker image.
- run: semgrep ci --sarif --output=semgrep.sarif
env:
# Add the rules that Semgrep uses by setting the SEMGREP_RULES environment variable.
SEMGREP_RULES: p/default # more at semgrep.dev/explore

- name: Upload SARIF file for GitHub Advanced Security Dashboard
uses: github/codeql-action/upload-sarif@6c089f53dd51dc3fc7e599c3cb5356453a52ca9e # v2.20.0
with:
sarif_file: semgrep.sarif
if: always()
6 changes: 3 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased] - yyyy-mm-dd

## [1.4.1] - 2023-02-06
## [1.4.2] - 2023-06-06

### Fixed
Stop API in case of multiple instances on same machine
### Changed
Update download links
1 change: 1 addition & 0 deletions CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @browserstack/local-dev
4 changes: 2 additions & 2 deletions browserstack-local.gemspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Gem::Specification.new do |s|
s.name = 'browserstack-local'
s.version = '1.4.1'
s.date = '2023-02-06'
s.version = '1.4.2'
s.date = '2023-06-06'
s.summary = "BrowserStack Local"
s.description = "Ruby bindings for BrowserStack Local"
s.authors = ["BrowserStack"]
Expand Down
10 changes: 5 additions & 5 deletions lib/browserstack/localbinary.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@ def initialize
@http_path = case host_os
when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
@windows = true
"https://bstack-local-prod.s3.amazonaws.com/BrowserStackLocal.exe"
"https://www.browserstack.com/local-testing/downloads/binaries/BrowserStackLocal.exe"
when /darwin|mac os/
"https://bstack-local-prod.s3.amazonaws.com/BrowserStackLocal-darwin-x64"
"https://www.browserstack.com/local-testing/downloads/binaries/BrowserStackLocal-darwin-x64"
when /linux-musl/
"https://bstack-local-prod.s3.amazonaws.com/BrowserStackLocal-alpine"
"https://www.browserstack.com/local-testing/downloads/binaries/BrowserStackLocal-alpine"
when /linux/
if 1.size == 8
"https://bstack-local-prod.s3.amazonaws.com/BrowserStackLocal-linux-x64"
"https://www.browserstack.com/local-testing/downloads/binaries/BrowserStackLocal-linux-x64"
else
"https://bstack-local-prod.s3.amazonaws.com/BrowserStackLocal-linux-ia32"
"https://www.browserstack.com/local-testing/downloads/binaries/BrowserStackLocal-linux-ia32"
end
end

Expand Down

0 comments on commit b44f38b

Please sign in to comment.