diff --git a/.github/ build-canary-v3 b/.github/ build-canary-v3 new file mode 100644 index 0000000..56a6051 --- /dev/null +++ b/.github/ build-canary-v3 @@ -0,0 +1 @@ +1 \ No newline at end of file diff --git a/.github/build-nest-v3 b/.github/build-nest-v3 new file mode 100644 index 0000000..56a6051 --- /dev/null +++ b/.github/build-nest-v3 @@ -0,0 +1 @@ +1 \ No newline at end of file diff --git a/.github/release-canary-v3 b/.github/release-canary-v3 new file mode 100644 index 0000000..56a6051 --- /dev/null +++ b/.github/release-canary-v3 @@ -0,0 +1 @@ +1 \ No newline at end of file diff --git a/.github/release-nest-v3 b/.github/release-nest-v3 new file mode 100644 index 0000000..56a6051 --- /dev/null +++ b/.github/release-nest-v3 @@ -0,0 +1 @@ +1 \ No newline at end of file diff --git a/.github/workflows/build-canaryv3.yml b/.github/workflows/build-canaryv3.yml index a6164ae..72adde7 100644 --- a/.github/workflows/build-canaryv3.yml +++ b/.github/workflows/build-canaryv3.yml @@ -1,11 +1,15 @@ name: PikaOS Package Build Only (Canary) (amd64-v3) on: - workflow_dispatch + push: + branches: + - main + paths: + - '.github/build-canary-v3' jobs: build: - runs-on: self-hosted + runs-on: ubuntu-latest container: image: ghcr.io/pikaos-linux/pikaos-builder:canaryv3 volumes: @@ -14,20 +18,13 @@ jobs: steps: - uses: actions/checkout@v3 - - - name: Import GPG key - id: import_gpg - uses: crazy-max/ghaction-import-gpg@v5 - with: - gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }} - passphrase: ${{ secrets.PASSPHRASE }} - name: Install SSH key uses: shimataro/ssh-key-action@v2 with: - key: ${{ secrets.SSH_KEY }} + key: ${{ vars.SSH_KEY }} name: id_rsa - known_hosts: ${{ secrets.KNOWN_HOSTS }} + known_hosts: ${{ vars.KNOWN_HOSTS }} if_key_exists: replace - name: Update APT Cache diff --git a/.github/workflows/build-nestv3.yml b/.github/workflows/build-nestv3.yml index 352cca0..3098818 100644 --- a/.github/workflows/build-nestv3.yml +++ b/.github/workflows/build-nestv3.yml @@ -1,11 +1,15 @@ name: PikaOS Package Build Only (amd64-v3) on: - workflow_dispatch + push: + branches: + - main + paths: + - '.github/build-nest-v3' jobs: build: - runs-on: self-hosted + runs-on: ubuntu-latest container: image: ghcr.io/pikaos-linux/pikaos-builder:nestv3 volumes: @@ -14,20 +18,13 @@ jobs: steps: - uses: actions/checkout@v3 - - - name: Import GPG key - id: import_gpg - uses: crazy-max/ghaction-import-gpg@v5 - with: - gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }} - passphrase: ${{ secrets.PASSPHRASE }} - name: Install SSH key uses: shimataro/ssh-key-action@v2 with: - key: ${{ secrets.SSH_KEY }} + key: ${{ vars.SSH_KEY }} name: id_rsa - known_hosts: ${{ secrets.KNOWN_HOSTS }} + known_hosts: ${{ vars.KNOWN_HOSTS }} if_key_exists: replace - name: Update APT Cache diff --git a/.github/workflows/release-canaryv3.yml b/.github/workflows/release-canaryv3.yml index 763db72..3e837ff 100644 --- a/.github/workflows/release-canaryv3.yml +++ b/.github/workflows/release-canaryv3.yml @@ -1,11 +1,15 @@ name: PikaOS Package Build & Release (Canary) (amd64-v3) on: - workflow_dispatch + push: + branches: + - main + paths: + - '.github/release-canary-v3' jobs: build: - runs-on: self-hosted + runs-on: ubuntu-latest container: image: ghcr.io/pikaos-linux/pikaos-builder:canaryv3 volumes: @@ -14,20 +18,13 @@ jobs: steps: - uses: actions/checkout@v3 - - - name: Import GPG key - id: import_gpg - uses: crazy-max/ghaction-import-gpg@v5 - with: - gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }} - passphrase: ${{ secrets.PASSPHRASE }} - name: Install SSH key uses: shimataro/ssh-key-action@v2 with: - key: ${{ secrets.SSH_KEY }} + key: ${{ vars.SSH_KEY }} name: id_rsa - known_hosts: ${{ secrets.KNOWN_HOSTS }} + known_hosts: ${{ vars.KNOWN_HOSTS }} if_key_exists: replace - name: Update APT Cache diff --git a/.github/workflows/release-nestv3.yml b/.github/workflows/release-nestv3.yml index cbd3f5b..bb9261e 100644 --- a/.github/workflows/release-nestv3.yml +++ b/.github/workflows/release-nestv3.yml @@ -1,11 +1,15 @@ name: PikaOS Package Build & Release (amd64-v3) on: - workflow_dispatch + push: + branches: + - main + paths: + - '.github/release-nest-v3' jobs: build: - runs-on: self-hosted + runs-on: ubuntu-latest container: image: ghcr.io/pikaos-linux/pikaos-builder:nestv3 volumes: @@ -14,20 +18,13 @@ jobs: steps: - uses: actions/checkout@v3 - - - name: Import GPG key - id: import_gpg - uses: crazy-max/ghaction-import-gpg@v5 - with: - gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }} - passphrase: ${{ secrets.PASSPHRASE }} - name: Install SSH key uses: shimataro/ssh-key-action@v2 with: - key: ${{ secrets.SSH_KEY }} + key: ${{ vars.SSH_KEY }} name: id_rsa - known_hosts: ${{ secrets.KNOWN_HOSTS }} + known_hosts: ${{ vars.KNOWN_HOSTS }} if_key_exists: replace - name: Update APT Cache diff --git a/cargo-config-v3.toml b/cargo-config-v3.toml index 014e7d6..3e2c55e 100644 --- a/cargo-config-v3.toml +++ b/cargo-config-v3.toml @@ -1,2 +1,3 @@ [build] -target = "x86-64-v3" \ No newline at end of file +[target.x86_64-unknown-linux-gnu] +rustflags = ["-Ctarget-cpu=x86-64-v3"] diff --git a/src/config.rs b/src/config.rs index fb60d01..a032c74 100644 --- a/src/config.rs +++ b/src/config.rs @@ -2,5 +2,4 @@ pub const APP_ID: &str = "com.github.pikaos-linux.pikadrivers"; pub const VERSION: &str = env!("CARGO_PKG_VERSION"); pub const APP_ICON: &str = "com.github.pikaos-linux.pikadrivers"; pub const APP_GITHUB: &str = "https://github.com/PikaOS-Linux/pkg-pika-drivers"; -pub const DRIVER_DB_JSON_URL: &str = - "https://raw.githubusercontent.com/PikaOS-Linux/pkg-pika-drivers/main/driver-db.json"; +pub const DRIVER_DB_JSON_URL: &str = "https://git.pika-os.com/custom-gui-packages/pika-drivers/raw/branch/main/driver-db.json";