Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated android build-tools #29

Merged
merged 5 commits into from
Aug 8, 2024
Merged

Updated android build-tools #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cafb100
Fixed workflow
guillemcordoba Aug 6, 2024
4624314
Fixed android build-tools
guillemcordoba Aug 7, 2024
c1b49da
Fix order of actions
guillemcordoba Aug 7, 2024
c2ce2b0
Fixed cache devshells workflow
guillemcordoba Aug 7, 2024
dbb2445
Fixes to workflows, readded android build tools
guillemcordoba Aug 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build-hc-pilot.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,5 @@ jobs:
CACHIX_AUTH_TOKEN: "${{ secrets.DARKSOIL_CACHIX_AUTH_TOKEN }}"
run: |
nix build --accept-flake-config -L .#hc-pilot
cachix push darksoil-studio $(nix --accept-flake-config path-info --accept-flake-config .#hc-pilot)
cachix pin darksoil-studio hc-progenitor $(nix --accept-flake-config path-info --accept-flake-config .#hc-pilot)
cachix push darksoil-studio $(nix path-info --json --accept-flake-config --no-warn-dirty .#hc-pilot | nix run nixpkgs#jq -- -r 'keys[0]')
cachix pin darksoil-studio hc-pilot $(nix path-info --json --accept-flake-config --no-warn-dirty .#hc-pilot | nix run nixpkgs#jq -- -r 'keys[0]')
8 changes: 4 additions & 4 deletions .github/workflows/build-scaffold-holochain-runtime.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,15 @@ jobs:
env:
CACHIX_AUTH_TOKEN: "${{ secrets.DARKSOIL_CACHIX_AUTH_TOKEN }}"
run: |
cachix watch-exec darksoil-studio -- nix build --accept-flake-config -L .#scaffold-holochain-runtime
cachix push darksoil-studio $(nix path-info --accept-flake-config .#scaffold-holochain-runtime)
cachix watch-exec darksoil-studio -- nix build --no-update-lock-file --accept-flake-config -L .#scaffold-holochain-runtime
cachix push darksoil-studio $(nix path-info --json --accept-flake-config --no-warn-dirty .#scaffold-holochain-runtime | nix run nixpkgs#jq -- -r 'keys[0]')

- name: Pin scaffold-holochain-runtime
if: github.event_name != 'pull_request' && github.ref_name == 'main'
env:
CACHIX_AUTH_TOKEN: "${{ secrets.DARKSOIL_CACHIX_AUTH_TOKEN }}"
run: |
cachix watch-exec darksoil-studio -- nix build --accept-flake-config -L .#scaffold-holochain-runtime
cachix push darksoil-studio $(nix path-info --accept-flake-config .#scaffold-holochain-runtime)
cachix pin darksoil-studio scaffold-holochain-runtime $(nix path-info --accept-flake-config .#scaffold-holochain-runtime)
cachix push darksoil-studio $(nix path-info --json --accept-flake-config --no-warn-dirty .#scaffold-holochain-runtime | nix run nixpkgs#jq -- -r 'keys[0]')
cachix pin darksoil-studio scaffold-holochain-runtime $(nix path-info --json --accept-flake-config --no-warn-dirty .#scaffold-holochain-runtime | nix run nixpkgs#jq -- -r 'keys[0]')

6 changes: 3 additions & 3 deletions .github/workflows/build-scaffold-tauri-happ.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
env:
CACHIX_AUTH_TOKEN: "${{ secrets.DARKSOIL_CACHIX_AUTH_TOKEN }}"
run: |
cachix watch-exec darksoil-studio -- nix build --accept-flake-config -L .#scaffold-tauri-happ
cachix push darksoil-studio $(nix path-info --accept-flake-config .#scaffold-tauri-happ)
cachix pin darksoil-studio scaffold-tauri-happ $(nix path-info --accept-flake-config .#scaffold-tauri-happ)
cachix watch-exec darksoil-studio -- nix build --no-update-lock-file --accept-flake-config -L .#scaffold-tauri-happ
cachix push darksoil-studio $(nix path-info --json --accept-flake-config --no-warn-dirty .#scaffold-tauri-happ | nix run nixpkgs#jq -- -r 'keys[0]')
cachix pin darksoil-studio scaffold-tauri-happ $(nix path-info --json --accept-flake-config --no-warn-dirty .#scaffold-tauri-happ | nix run nixpkgs#jq -- -r 'keys[0]')

25 changes: 16 additions & 9 deletions .github/workflows/cache-devshells.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ on:
# but only for the main branch
push:
branches: [ main ]
pull_request:
branches: [ main ]

jobs:
cache-devshells:
Expand All @@ -16,6 +18,10 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Extend space
if: ${{ matrix.os == 'ubuntu-latest' }}
uses: ./.github/actions/extend-space

- name: Install nix
uses: cachix/install-nix-action@v25
with:
Expand All @@ -38,14 +44,15 @@ jobs:
CACHIX_AUTH_TOKEN: "${{ secrets.DARKSOIL_CACHIX_AUTH_TOKEN }}"
run: |
cachix watch-exec darksoil-studio -- nix flake check --accept-flake-config -L
nix develop --accept-flake-config --profile holochainTauriDev -c true .#holochainTauriDev
nix develop --no-update-lock-file --accept-flake-config --profile holochainTauriDev -c true .#holochainTauriDev
cachix push darksoil-studio holochainTauriDev
nix develop --accept-flake-config --profile holochainTauriAndroidDev -c true .#holochainTauriAndroidDev
nix develop --no-update-lock-file --accept-flake-config --profile holochainTauriAndroidDev -c true .#holochainTauriAndroidDev
cachix push darksoil-studio holochainTauriAndroidDev
nix build .#holochainTauriRust -L --accept-flake-config
nix build .#androidTauriRust -L --accept-flake-config

cachix push darksoil-studio $(nix path-info --accept-flake-config .#holochainTauriRust)
cachix push darksoil-studio $(nix path-info --accept-flake-config .#androidTauriRust)
cachix pin darksoil-studio holochainTauriRust $(nix path-info --accept-flake-config .#holochainTauriRust)
cachix pin darksoil-studio androidTauriRust $(nix path-info --accept-flake-config .#androidTauriRust)

cachix watch-exec darksoil-studio -- nix build --no-update-lock-file -L --accept-flake-config .#holochainTauriRust
cachix push darksoil-studio $(nix path-info --json --accept-flake-config --no-warn-dirty .#holochainTauriRust | nix run nixpkgs#jq -- -r 'keys[0]')
cachix pin darksoil-studio holochainTauriRust $(nix path-info --json --accept-flake-config --no-warn-dirty .#holochainTauriRust | nix run nixpkgs#jq -- -r 'keys[0]')

cachix watch-exec darksoil-studio -- nix build --no-update-lock-file -L --accept-flake-config .#androidTauriRust
cachix push darksoil-studio $(nix path-info --json --accept-flake-config --no-warn-dirty .#androidTauriRust | nix run nixpkgs#jq -- -r 'keys[0]')
cachix pin darksoil-studio androidTauriRust $(nix path-info --json --accept-flake-config --no-warn-dirty .#androidTauriRust | nix run nixpkgs#jq -- -r 'keys[0]')
28 changes: 14 additions & 14 deletions examples/end-user-happ/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

62 changes: 31 additions & 31 deletions examples/end-user-happ/flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading