Skip to content

Commit

Permalink
chore: merge origin/main
Browse files Browse the repository at this point in the history
  • Loading branch information
kieranroneill committed Oct 16, 2024
2 parents 8b05121 + 2dc57c0 commit 99ab9b9
Show file tree
Hide file tree
Showing 10 changed files with 516 additions and 572 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request_template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: Suggest an idea or feature for Kibisis
title: "[Feature]: "
labels: ["✨ feature"]
assignees:
- agoralabs-bot
- kibi-bot

body:
# welcome
Expand Down
42 changes: 21 additions & 21 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
uses: ./.github/actions/download-latest-release-asset
with:
asset_prefix: "kibisis-chrome"
github_token: ${{ secrets.WRITE_REPOS_TOKEN }}
github_token: ${{ secrets.READ_AND_WRITE_REPOS_TOKEN }}
- name: "🚀 Publish"
uses: ./.github/actions/publish-to-chrome-web-store
with:
Expand All @@ -26,26 +26,26 @@ jobs:
refresh_token: ${{ secrets.CHROME_WEB_STORE_API_REFRESH_TOKEN }}
zip_file_name: kibisis-chrome.zip

publish_to_micorsoft_edge_add_ons:
name: "Publish To Microsoft Edge Add-ons"
runs-on: ubuntu-latest
steps:
- name: "🛎 Checkout"
uses: actions/checkout@v4
- name: "📥 Download Latest Release Asset"
uses: ./.github/actions/download-latest-release-asset
with:
asset_prefix: "kibisis-edge"
github_token: ${{ secrets.WRITE_REPOS_TOKEN }}
- name: "🚀 Publish"
uses: ./.github/actions/publish-to-microsoft-edge-add-ons
with:
# set in the Settings > Secrets and variables > Actions > Secrets
access_token_url: ${{ secrets.MICROSOFT_EDGE_ADD_ONS_API_ACCESS_TOKEN_URL }}
client_id: ${{ secrets.MICROSOFT_EDGE_ADD_ONS_API_CLIENT_ID }}
client_secret: ${{ secrets.MICROSOFT_EDGE_ADD_ONS_API_CLIENT_SECRET }}
product_id: ${{ vars.MICROSOFT_EDGE_ADD_ON_PRODUCT_ID }}
zip_file_name: kibisis-edge.zip
# publish_to_micorsoft_edge_add_ons:
# name: "Publish To Microsoft Edge Add-ons"
# runs-on: ubuntu-latest
# steps:
# - name: "🛎 Checkout"
# uses: actions/checkout@v4
# - name: "📥 Download Latest Release Asset"
# uses: ./.github/actions/download-latest-release-asset
# with:
# asset_prefix: "kibisis-edge"
# github_token: ${{ secrets.READ_AND_WRITE_REPOS_TOKEN }}
# - name: "🚀 Publish"
# uses: ./.github/actions/publish-to-microsoft-edge-add-ons
# with:
# # set in the Settings > Secrets and variables > Actions > Secrets
# access_token_url: ${{ secrets.MICROSOFT_EDGE_ADD_ONS_API_ACCESS_TOKEN_URL }}
# client_id: ${{ secrets.MICROSOFT_EDGE_ADD_ONS_API_CLIENT_ID }}
# client_secret: ${{ secrets.MICROSOFT_EDGE_ADD_ONS_API_CLIENT_SECRET }}
# product_id: ${{ vars.MICROSOFT_EDGE_ADD_ON_PRODUCT_ID }}
# zip_file_name: kibisis-edge.zip

# TODO: ignore until firefox accept add-on submissions
# publish_to_firefox_add_ons:
Expand Down
61 changes: 1 addition & 60 deletions .github/workflows/pull_request_checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
uses: ./.github/actions/use-dependencies

##
# lint, type-check and test
# lint, type-check, build and test
##

lint:
Expand Down Expand Up @@ -77,13 +77,6 @@ jobs:
provider_id: ${{ vars.PROVIDER_ID }}
- name: "🏗️ Build"
run: yarn build:chrome
- name: "🗜️ Zip build"
run: zip -qr chrome_build.zip .chrome_build/
- name: "📤 Upload build"
uses: actions/upload-artifact@v4
with:
name: chrome_build
path: chrome_build.zip

build_edge:
name: "Build Edge"
Expand All @@ -101,13 +94,6 @@ jobs:
provider_id: ${{ vars.PROVIDER_ID }}
- name: "🏗️ Build"
run: yarn build:edge
- name: "🗜️ Zip build"
run: zip -qr edge_build.zip .edge_build/
- name: "📤 Upload build"
uses: actions/upload-artifact@v4
with:
name: edge_build
path: edge_build.zip

build_firefox:
name: "Build Firefox"
Expand All @@ -125,50 +111,5 @@ jobs:
provider_id: ${{ vars.PROVIDER_ID }}
- name: "🏗️ Build"
run: yarn build:firefox
- name: "🗜️ Zip build"
run: zip -qr firefox_build.zip .firefox_build/
- name: "📤 Upload build"
uses: actions/upload-artifact@v4
with:
name: firefox_build
path: firefox_build.zip

##
# build validation
##

validate_firefox:
name: "Validate Firefox"
needs: [install, build_firefox]
runs-on: ubuntu-latest
steps:
- name: "🛎 Checkout"
uses: actions/checkout@v4
- name: "🔧 Setup"
uses: ./.github/actions/use-dependencies
- name: "📥 Download build"
uses: actions/download-artifact@v4
with:
name: firefox_build
- name: "🗜️ Unzip build"
run: unzip -q firefox_build.zip
- name: "✅ Validate"
run: yarn validate:firefox

##
# clean up
##

clean_up:
name: "Clean Up"
needs: validate_firefox
runs-on: ubuntu-latest
steps:
- name: "🗑️ Delete artifacts"
uses: geekyeggo/delete-artifact@v4
with:
failOnError: false
name: |
chrome_build
edge_build
firefox_build
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ jobs:
- name: "🔖 Release"
env:
# appears on the release commits
GIT_AUTHOR_NAME: agoralabs-bot
GIT_AUTHOR_EMAIL: tech@agoralabs.sh
GIT_COMMITTER_NAME: agoralabs-bot
GIT_COMMITTER_EMAIL: tech@agoralabs.sh
GIT_AUTHOR_NAME: kibi-bot
GIT_AUTHOR_EMAIL: builders@kibis.is
GIT_COMMITTER_NAME: kibi-bot
GIT_COMMITTER_EMAIL: builders@kibis.is
# used to push the release commit and create the tags
GITHUB_TOKEN: ${{ secrets.WRITE_REPOS_TOKEN }}
GITHUB_TOKEN: ${{ secrets.READ_AND_WRITE_REPOS_TOKEN }}
run: yarn semantic-release
Loading

0 comments on commit 99ab9b9

Please sign in to comment.