Compare commits
	
		
			No commits in common. "2930a357342d779c956efc8685f5833f05673232" and "40c651d99dd98a8a64bf25b584811c422c3e4166" have entirely different histories. 
		
	
	
		
			2930a35734
			...
			40c651d99d
		
	
		| 
						 | 
					@ -1,22 +0,0 @@
 | 
				
			||||||
steps:
 | 
					 | 
				
			||||||
  build-docker-image:
 | 
					 | 
				
			||||||
    image: alpine:edge
 | 
					 | 
				
			||||||
    commands:
 | 
					 | 
				
			||||||
      - apk add --no-cache git nix --repository=https://dl-cdn.alpinelinux.org/alpine/edge/testing
 | 
					 | 
				
			||||||
      - echo "system-features = nixos-test benchmark big-parallel uid-range kvm" > /etc/nix/nix.conf
 | 
					 | 
				
			||||||
      - nix build --extra-experimental-features nix-command --extra-experimental-features flakes .#docker
 | 
					 | 
				
			||||||
      - cp $(nix build --extra-experimental-features nix-command --extra-experimental-features flakes --print-out-paths .#docker) ./memejoin-rs.tar.gz
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  publish-image:
 | 
					 | 
				
			||||||
    when:
 | 
					 | 
				
			||||||
      - event: tag
 | 
					 | 
				
			||||||
        branch: master
 | 
					 | 
				
			||||||
    image: docker
 | 
					 | 
				
			||||||
    secrets: [ forgejo_token ]
 | 
					 | 
				
			||||||
    commands:
 | 
					 | 
				
			||||||
      - 'docker login -u ${CI_REPO_OWNER} --password $${FORGEJO_TOKEN} git.spacegirl.nl'
 | 
					 | 
				
			||||||
      - 'docker image load --input memejoin-rs.tar.gz'
 | 
					 | 
				
			||||||
      - 'docker image tag memejoin-rs:${CI_COMMIT_TAG} git.spacegirl.nl/${CI_REPO}:${CI_COMMIT_TAG}'
 | 
					 | 
				
			||||||
      - 'docker image push git.spacegirl.nl/${CI_REPO}:${CI_COMMIT_TAG}'
 | 
					 | 
				
			||||||
    volumes:
 | 
					 | 
				
			||||||
      - /var/run/docker.sock:/var/run/docker.sock
 | 
					 | 
				
			||||||
| 
						 | 
					@ -8,7 +8,6 @@
 | 
				
			||||||
  outputs = { self, nixpkgs, rust-overlay, flake-utils, ... }:
 | 
					  outputs = { self, nixpkgs, rust-overlay, flake-utils, ... }:
 | 
				
			||||||
    flake-utils.lib.eachDefaultSystem (system:
 | 
					    flake-utils.lib.eachDefaultSystem (system:
 | 
				
			||||||
      let
 | 
					      let
 | 
				
			||||||
        tag = "0.1.4_3-alpha";
 | 
					 | 
				
			||||||
        overlays = [ (import rust-overlay) ];
 | 
					        overlays = [ (import rust-overlay) ];
 | 
				
			||||||
        pkgs = import nixpkgs {
 | 
					        pkgs = import nixpkgs {
 | 
				
			||||||
          inherit system overlays;
 | 
					          inherit system overlays;
 | 
				
			||||||
| 
						 | 
					@ -46,8 +45,8 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        packages = with pkgs; flake-utils.lib.flattenTree rec {
 | 
					        packages = with pkgs; flake-utils.lib.flattenTree rec {
 | 
				
			||||||
          default = rustPlatform.buildRustPackage rec {
 | 
					          default = rustPlatform.buildRustPackage rec {
 | 
				
			||||||
            inherit tag;
 | 
					 | 
				
			||||||
            name = "memejoin-rs";
 | 
					            name = "memejoin-rs";
 | 
				
			||||||
 | 
					            version = "0.1.4_2-alpha";
 | 
				
			||||||
            src = self;
 | 
					            src = self;
 | 
				
			||||||
            buildInputs = [ openssl.dev ];
 | 
					            buildInputs = [ openssl.dev ];
 | 
				
			||||||
            nativeBuildInputs = [ local-rust pkg-config openssl openssl.dev cmake gcc libopus ];
 | 
					            nativeBuildInputs = [ local-rust pkg-config openssl openssl.dev cmake gcc libopus ];
 | 
				
			||||||
| 
						 | 
					@ -58,8 +57,8 @@
 | 
				
			||||||
          };
 | 
					          };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
          docker = dockerTools.buildImage {
 | 
					          docker = dockerTools.buildImage {
 | 
				
			||||||
            inherit tag;
 | 
					 | 
				
			||||||
            name = "memejoin-rs";
 | 
					            name = "memejoin-rs";
 | 
				
			||||||
 | 
					            tag = "0.1.4_2-alpha";
 | 
				
			||||||
            copyToRoot = buildEnv {
 | 
					            copyToRoot = buildEnv {
 | 
				
			||||||
              name = "image-root";
 | 
					              name = "image-root";
 | 
				
			||||||
              paths = [ default cacert openssl openssl.dev ffmpeg libopus youtube-dl yt-dlp ];
 | 
					              paths = [ default cacert openssl openssl.dev ffmpeg libopus youtube-dl yt-dlp ];
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue